X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=protocol%2Fbbft.go;h=f8658979ed4404cd57ebf30cde150954aa6ce1af;hp=5667bc6f13154aa2bae26f28656b749ff34763be;hb=a626fb6dc07f4f9f93f77003eeedd419235403ed;hpb=96b79e74c5defa5144136e26b642df5ae2adc372 diff --git a/protocol/bbft.go b/protocol/bbft.go index 5667bc6f..f8658979 100644 --- a/protocol/bbft.go +++ b/protocol/bbft.go @@ -7,7 +7,9 @@ import ( log "github.com/sirupsen/logrus" "github.com/vapor/config" + "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" @@ -18,210 +20,206 @@ 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") + 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.getConsensusNodesByVoteResult(&blockNode.Parent.Hash) +func (c *Chain) checkDoubleSign(bh *types.BlockHeader, xPub string) error { + blockHashes, err := c.store.GetBlockHashesByHeight(bh.Height) if err != nil { - return false + return err } - signCount := 0 - for i := 0; i < len(consensusNodes); i++ { - if ok, _ := blockNode.BlockWitness.Test(uint32(i)); ok { - signCount++ + for _, blockHash := range blockHashes { + if *blockHash == bh.Hash() { + continue } - } - return signCount > len(consensusNodes)*2/3 -} + blockHeader, err := c.store.GetBlockHeader(blockHash) + if err != nil { + return err + } -// 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) + 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 } -// 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 []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 +func (c *Chain) checkNodeSign(bh *types.BlockHeader, consensusNode *state.ConsensusNode, signature []byte) error { + if !consensusNode.XPub.Verify(bh.Hash().Bytes(), signature) { + return errInvalidSignature } - consensusNode, err := c.consensusNodeManager.getConsensusNode(&blockNode.Parent.Hash, xpubStr) + 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 err + return false } - if consensusNode.XPub.Verify(blockHash.Bytes(), signature) { - return errInvalidSignature + signCount := 0 + for i := 0; i < len(consensusNodes); i++ { + if blockHeader.BlockWitness.Get(uint64(i)) != nil { + signCount++ + } } - isDoubleSign, err := c.checkDoubleSign(consensusNode.Order, blockNode.Height, *blockHash) - if err != nil { + return signCount > len(consensusNodes)*2/3 +} + +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 isDoubleSign { - return errDoubleSignBlock + if !c.isIrreversible(blockHeader) || blockHeader.Height <= c.lastIrrBlockHeader.Height { + return nil } - if err := c.updateBlockSignature(&blockNode.Hash, consensusNode.Order, 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 c.isIrreversible(blockNode) && blockNode.Height > c.bestIrreversibleNode.Height { - bestIrreversibleNode := c.index.GetNode(blockHash) - if err := c.store.SaveChainNodeStatus(c.bestNode, bestIrreversibleNode); err != nil { + 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 } - c.bestIrreversibleNode = bestIrreversibleNode + return c.reorganizeChain(tail) } 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 -func (c *Chain) validateSign(block *types.Block) (uint64, error) { - consensusNodeMap, err := c.consensusNodeManager.getConsensusNodesByVoteResult(&block.PreviousBlockHash) +// 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.getConsensusNodes(&block.PreviousBlockHash) + if err != nil { + return err + } + + blocker, err := c.GetBlocker(&block.PreviousBlockHash, block.Timestamp) if err != nil { - return 0, err + return err } hasBlockerSign := false - signCount := uint64(0) 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: []byte(pubKey)}) + c.signatureCache.Remove(cachekey) } else { continue } } - 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 isDoubleSign { - // Consensus node is signed twice with the same block height, discard the signature + 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 } - signCount++ - isBlocker, err := c.consensusNodeManager.isBlocker(&block.PreviousBlockHash, pubKey, block.Timestamp) - if err != nil { - return 0, err - } - - if isBlocker { + if blocker == pubKey { hasBlockerSign = true } - } if !hasBlockerSign { - return 0, errors.New("the block has no signature of the blocker") + return errors.New("the block has no signature of the blocker") } - return signCount, nil + return nil } -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 { - if err := c.updateBlockSignature(&blockHash, nodeOrder, nil); err != nil { - return false, err - } +// 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) - return true, nil + // 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 } + + cacheKey := signCacheKey(blockHash.String(), xpubStr) + c.signatureCache.Add(cacheKey, signature) + return nil } - return false, nil -} -// SignBlock signing the block if current node is consensus node -func (c *Chain) SignBlock(block *types.Block) ([]byte, error) { - xprv := config.CommonConfig.PrivateKey() - xpub := [64]byte(xprv.XPub()) - node, err := c.consensusNodeManager.getConsensusNode(&block.PreviousBlockHash, hex.EncodeToString(xpub[:])) - if err != nil && err != errNotFoundConsensusNode { - return nil, err + consensusNode, err := c.getConsensusNode(&blockHeader.PreviousBlockHash, xpubStr) + if err != nil { + return err } - if node == nil { - return nil, nil + if blockHeader.BlockWitness.Get(consensusNode.Order) != nil { + return nil } - 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 - } + c.cond.L.Lock() + defer c.cond.L.Unlock() + if err := c.checkNodeSign(blockHeader, consensusNode, signature); err != nil { + return err } - signature := block.Witness[node.Order] - if len(signature) == 0 { - signature = xprv.Sign(block.Hash().Bytes()) - block.Witness[node.Order] = signature + if err := c.updateBlockSignature(blockHeader, consensusNode.Order, signature); err != nil { + return err } - return signature, nil + return c.eventDispatcher.Post(event.BlockSignatureEvent{BlockHash: *blockHash, Signature: signature, XPub: xPub}) } -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 - } - } else { - if err := blockNode.BlockWitness.Clean(uint32(nodeOrder)); err != nil { - return err - } +// 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.getConsensusNode(&block.PreviousBlockHash, xpubStr) + if err == errNotFoundConsensusNode { + return nil, nil + } else if err != nil { + return nil, err } - block, err := c.store.GetBlock(blockHash) - if err != nil { - return err + if err := c.checkDoubleSign(&block.BlockHeader, node.XPub.String()); err == errDoubleSignBlock { + return nil, nil + } else if err != nil { + return nil, err } - block.Witness[nodeOrder] = signature - txStatus, err := c.consensusNodeManager.store.GetTransactionStatus(blockHash) - if err != nil { - return err + signature := block.Get(node.Order) + if len(signature) == 0 { + signature = xprv.Sign(block.Hash().Bytes()) + block.Set(node.Order, signature) } - - return c.consensusNodeManager.store.SaveBlock(block, txStatus) + return signature, nil }