X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=protocol%2Fblock.go;h=c1dc2651fa9b8a281d04ab127216f912b79e193b;hb=2e4f5f11ae3bec54e4918a7aac5c8b3e2381de44;hp=1894f68b6f7af25c7c2da7840fb6e11674071471;hpb=cc968002ceac2dfd7665c2ac2b4c32ab6017b525;p=bytom%2Fvapor.git diff --git a/protocol/block.go b/protocol/block.go index 1894f68b..c1dc2651 100644 --- a/protocol/block.go +++ b/protocol/block.go @@ -3,7 +3,9 @@ package protocol 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" @@ -20,7 +22,10 @@ var ( // BlockExist check is a block in chain or orphan func (c *Chain) BlockExist(hash *bc.Hash) bool { - return c.index.BlockExist(hash) || c.orphanManage.BlockExist(hash) + if _, err := c.store.GetBlockHeader(hash); err == nil { + return true + } + return c.orphanManage.BlockExist(hash) } // GetBlockByHash return a block by given hash @@ -28,49 +33,59 @@ func (c *Chain) GetBlockByHash(hash *bc.Hash) (*types.Block, error) { return c.store.GetBlock(hash) } -// GetBlockByHeight return a block header by given height +// GetBlockByHeight return a block by given height func (c *Chain) GetBlockByHeight(height uint64) (*types.Block, error) { - node := c.index.NodeByHeight(height) - if node == nil { - return nil, errors.New("can't find block in given height") + hash, err := c.store.GetMainChainHash(height) + if err != nil { + return nil, errors.Wrap(err, "can't find block in given height") } - return c.store.GetBlock(&node.Hash) + return c.store.GetBlock(hash) } // GetHeaderByHash return a block header by given hash func (c *Chain) GetHeaderByHash(hash *bc.Hash) (*types.BlockHeader, error) { - node := c.index.GetNode(hash) - if node == nil { - return nil, errors.New("can't find block header in given hash") - } - return node.BlockHeader(), nil + return c.store.GetBlockHeader(hash) } // GetHeaderByHeight return a block header by given height func (c *Chain) GetHeaderByHeight(height uint64) (*types.BlockHeader, error) { - node := c.index.NodeByHeight(height) - if node == nil { - return nil, errors.New("can't find block header in given height") + hash, err := c.store.GetMainChainHash(height) + if err != nil { + return nil, errors.Wrap(err, "can't find block header in given height") } - return node.BlockHeader(), nil + return c.store.GetBlockHeader(hash) } -func (c *Chain) calcReorganizeNodes(node *state.BlockNode) ([]*state.BlockNode, []*state.BlockNode) { - var attachNodes []*state.BlockNode - var detachNodes []*state.BlockNode +func (c *Chain) calcReorganizeChain(beginAttach *types.BlockHeader, beginDetach *types.BlockHeader) ([]*types.BlockHeader, []*types.BlockHeader, error) { + var err error + var attachBlockHeaders []*types.BlockHeader + var detachBlockHeaders []*types.BlockHeader - attachNode := node - for c.index.NodeByHeight(attachNode.Height) != attachNode { - attachNodes = append([]*state.BlockNode{attachNode}, attachNodes...) - attachNode = attachNode.Parent - } + for attachBlockHeader, detachBlockHeader := beginAttach, beginDetach; detachBlockHeader.Hash() != attachBlockHeader.Hash(); { + var attachRollback, detachRollBack bool + if attachRollback = attachBlockHeader.Height >= detachBlockHeader.Height; attachRollback { + attachBlockHeaders = append([]*types.BlockHeader{attachBlockHeader}, attachBlockHeaders...) + } + + if detachRollBack = attachBlockHeader.Height <= detachBlockHeader.Height; detachRollBack { + detachBlockHeaders = append(detachBlockHeaders, detachBlockHeader) + } + + if attachRollback { + attachBlockHeader, err = c.store.GetBlockHeader(&attachBlockHeader.PreviousBlockHash) + if err != nil { + return nil, nil, err + } + } - detachNode := c.bestNode - for detachNode != attachNode { - detachNodes = append(detachNodes, detachNode) - detachNode = detachNode.Parent + if detachRollBack { + detachBlockHeader, err = c.store.GetBlockHeader(&detachBlockHeader.PreviousBlockHash) + if err != nil { + return nil, nil, err + } + } } - return attachNodes, detachNodes + return attachBlockHeaders, detachBlockHeaders, nil } func (c *Chain) connectBlock(block *types.Block) (err error) { @@ -86,30 +101,46 @@ func (c *Chain) connectBlock(block *types.Block) (err error) { if err := utxoView.ApplyBlock(bcBlock, bcBlock.TransactionStatus); err != nil { return err } - node := c.index.GetNode(&bcBlock.ID) - if err := c.setState(node, utxoView); err != nil { + + consensusResult, err := c.getBestConsensusResult() + if err != nil { + return err + } + if err := consensusResult.ApplyBlock(block); err != nil { return err } + + irrBlockHeader := c.lastIrrBlockHeader + if c.isIrreversible(&block.BlockHeader) && block.Height > irrBlockHeader.Height { + irrBlockHeader = &block.BlockHeader + } + + if err := c.setState(&block.BlockHeader, irrBlockHeader, []*types.BlockHeader{&block.BlockHeader}, utxoView, []*state.ConsensusResult{consensusResult}); err != nil { + return err + } + for _, tx := range block.Transactions { - for key, value := range tx.Entries { - switch value.(type) { - case *bc.Claim: - c.store.SetWithdrawSpent(&key) - default: - continue - } - } c.txPool.RemoveTransaction(&tx.Tx.ID) } return nil } -func (c *Chain) reorganizeChain(node *state.BlockNode) error { - attachNodes, detachNodes := c.calcReorganizeNodes(node) +func (c *Chain) reorganizeChain(blockHeader *types.BlockHeader) error { + attachBlockHeaders, detachBlockHeaders, err := c.calcReorganizeChain(blockHeader, c.bestBlockHeader) + if err != nil { + return err + } + utxoView := state.NewUtxoViewpoint() + consensusResults := []*state.ConsensusResult{} + consensusResult, err := c.getBestConsensusResult() + if err != nil { + return err + } - for _, detachNode := range detachNodes { - b, err := c.store.GetBlock(&detachNode.Hash) + for _, detachBlockHeader := range detachBlockHeaders { + detachHash := detachBlockHeader.Hash() + b, err := c.store.GetBlock(&detachHash) if err != nil { return err } @@ -118,19 +149,28 @@ func (c *Chain) reorganizeChain(node *state.BlockNode) error { if err := c.store.GetTransactionsUtxo(utxoView, detachBlock.Transactions); err != nil { return err } + txStatus, err := c.GetTransactionStatus(&detachBlock.ID) if err != nil { return err } + if err := utxoView.DetachBlock(detachBlock, txStatus); err != nil { return err } - log.WithFields(log.Fields{"height": node.Height, "hash": node.Hash.String()}).Debug("detach from mainchain") + if err := consensusResult.DetachBlock(b); err != nil { + return err + } + + blockHash := blockHeader.Hash() + log.WithFields(log.Fields{"module": logModule, "height": blockHeader.Height, "hash": blockHash.String()}).Debug("detach from mainchain") } - for _, attachNode := range attachNodes { - b, err := c.store.GetBlock(&attachNode.Hash) + irrBlockHeader := c.lastIrrBlockHeader + for _, attachBlockHeader := range attachBlockHeaders { + attachHash := attachBlockHeader.Hash() + b, err := c.store.GetBlock(&attachHash) if err != nil { return err } @@ -139,39 +179,87 @@ func (c *Chain) reorganizeChain(node *state.BlockNode) error { if err := c.store.GetTransactionsUtxo(utxoView, attachBlock.Transactions); err != nil { return err } + txStatus, err := c.GetTransactionStatus(&attachBlock.ID) if err != nil { return err } + if err := utxoView.ApplyBlock(attachBlock, txStatus); err != nil { return err } - log.WithFields(log.Fields{"height": node.Height, "hash": node.Hash.String()}).Debug("attach from mainchain") + if err := consensusResult.ApplyBlock(b); err != nil { + return err + } + + if consensusResult.IsFinalize() { + consensusResults = append(consensusResults, consensusResult.Fork()) + } + + if c.isIrreversible(attachBlockHeader) && attachBlockHeader.Height > irrBlockHeader.Height { + irrBlockHeader = attachBlockHeader + } + + blockHash := blockHeader.Hash() + log.WithFields(log.Fields{"module": logModule, "height": blockHeader.Height, "hash": blockHash.String()}).Debug("attach from mainchain") } - return c.setState(node, utxoView) + if len(detachBlockHeaders) > 0 && + detachBlockHeaders[len(detachBlockHeaders)-1].Height <= c.lastIrrBlockHeader.Height && + irrBlockHeader.Height <= c.lastIrrBlockHeader.Height { + return errors.New("rollback block below the height of irreversible block") + } + consensusResults = append(consensusResults, consensusResult.Fork()) + return c.setState(blockHeader, irrBlockHeader, attachBlockHeaders, utxoView, consensusResults) } // SaveBlock will validate and save block into storage func (c *Chain) saveBlock(block *types.Block) error { - bcBlock := types.MapBlock(block) - parent := c.index.GetNode(&block.PreviousBlockHash) - - if err := validation.ValidateBlock(bcBlock, parent, block, c, c.engine, c.Authoritys, c.position); err != nil { + if err := c.validateSign(block); err != nil { return errors.Sub(ErrBadBlock, err) } - if err := c.store.SaveBlock(block, bcBlock.TransactionStatus); err != nil { + + parent, err := c.store.GetBlockHeader(&block.PreviousBlockHash) + if err != nil { return err } - c.orphanManage.Delete(&bcBlock.ID) - node, err := state.NewBlockNode(&block.BlockHeader, parent) + consensusResult, err := c.GetConsensusResultByHash(&block.PreviousBlockHash) + if err != nil { + return err + } + + if err := consensusResult.AttachCoinbaseReward(block); err != nil { + return err + } + + rewards, err := consensusResult.GetCoinbaseRewards(block.Height) if err != nil { return err } - c.index.AddNode(node) + bcBlock := types.MapBlock(block) + if err := validation.ValidateBlock(bcBlock, parent, rewards); err != nil { + return errors.Sub(ErrBadBlock, err) + } + + signature, err := c.SignBlock(block) + if err != nil { + return errors.Sub(ErrBadBlock, err) + } + + if err := c.store.SaveBlock(block, bcBlock.TransactionStatus); err != nil { + return err + } + c.orphanManage.Delete(&bcBlock.ID) + + if len(signature) != 0 { + xPub := config.CommonConfig.PrivateKey().XPub() + if err := c.eventDispatcher.Post(event.BlockSignatureEvent{BlockHash: block.Hash(), Signature: signature, XPub: xPub[:]}); err != nil { + return err + } + } return nil } @@ -186,11 +274,11 @@ func (c *Chain) saveSubBlock(block *types.Block) *types.Block { for _, prevOrphan := range prevOrphans { orphanBlock, ok := c.orphanManage.Get(prevOrphan) if !ok { - log.WithFields(log.Fields{"hash": prevOrphan.String()}).Warning("saveSubBlock fail to get block from orphanManage") + log.WithFields(log.Fields{"module": logModule, "hash": prevOrphan.String()}).Warning("saveSubBlock fail to get block from orphanManage") continue } if err := c.saveBlock(orphanBlock); err != nil { - log.WithFields(log.Fields{"hash": prevOrphan.String(), "height": orphanBlock.Height}).Warning("saveSubBlock fail to save block") + log.WithFields(log.Fields{"module": logModule, "hash": prevOrphan.String(), "height": orphanBlock.Height}).Warning("saveSubBlock fail to save block") continue } @@ -230,11 +318,11 @@ func (c *Chain) blockProcesser() { func (c *Chain) processBlock(block *types.Block) (bool, error) { blockHash := block.Hash() if c.BlockExist(&blockHash) { - log.WithFields(log.Fields{"hash": blockHash.String(), "height": block.Height}).Info("block has been processed") + log.WithFields(log.Fields{"module": logModule, "hash": blockHash.String(), "height": block.Height}).Info("block has been processed") return c.orphanManage.BlockExist(&blockHash), nil } - if parent := c.index.GetNode(&block.PreviousBlockHash); parent == nil { + if _, err := c.store.GetBlockHeader(&block.PreviousBlockHash); err != nil { c.orphanManage.Add(block) return true, nil } @@ -244,17 +332,18 @@ func (c *Chain) processBlock(block *types.Block) (bool, error) { } bestBlock := c.saveSubBlock(block) - bestBlockHash := bestBlock.Hash() - bestNode := c.index.GetNode(&bestBlockHash) + bestBlockHeader := &bestBlock.BlockHeader - if bestNode.Parent == c.bestNode { - log.Debug("append block to the end of mainchain") + c.cond.L.Lock() + defer c.cond.L.Unlock() + if bestBlockHeader.PreviousBlockHash == c.bestBlockHeader.Hash() { + log.WithFields(log.Fields{"module": logModule}).Debug("append block to the end of mainchain") return false, c.connectBlock(bestBlock) } - if bestNode.Height > c.bestNode.Height && bestNode.WorkSum.Cmp(c.bestNode.WorkSum) >= 0 { - log.Debug("start to reorganize chain") - return false, c.reorganizeChain(bestNode) + if bestBlockHeader.Height > c.bestBlockHeader.Height { + log.WithFields(log.Fields{"module": logModule}).Debug("start to reorganize chain") + return false, c.reorganizeChain(bestBlockHeader) } return false, nil }