log "github.com/sirupsen/logrus"
"github.com/vapor/config"
- engine "github.com/vapor/consensus/consensus"
- "github.com/vapor/errors"
+ "github.com/vapor/event"
"github.com/vapor/protocol/bc"
"github.com/vapor/protocol/bc/types"
"github.com/vapor/protocol/state"
orphanManage *OrphanManage
txPool *TxPool
store Store
+ bbft *bbft
processBlockCh chan *processBlockMsg
- cond sync.Cond
- bestNode *state.BlockNode
- Authoritys map[string]string
- position uint64
- engine engine.Engine
+ cond sync.Cond
+ bestNode *state.BlockNode
+ bestIrreversibleNode *state.BlockNode
}
// NewChain returns a new Chain using store as the underlying storage.
-func NewChain(store Store, txPool *TxPool) (*Chain, error) {
+func NewChain(store Store, txPool *TxPool, eventDispatcher *event.Dispatcher) (*Chain, error) {
c := &Chain{
orphanManage: NewOrphanManage(),
txPool: txPool,
c.bestNode = c.index.GetNode(storeStatus.Hash)
c.index.SetMainChain(c.bestNode)
+ c.bbft = newBbft(store, c.index, c.orphanManage, eventDispatcher)
go c.blockProcesser()
return c, nil
}
-func (c *Chain) SetAuthoritys(authoritys map[string]string) {
- c.Authoritys = authoritys
-}
-
-func (c *Chain) SetPosition(position uint64) {
- c.position = position
-}
-
-func (c *Chain) SetConsensusEngine(engine engine.Engine) {
- c.engine = engine
-}
-
func (c *Chain) initChainStatus() error {
genesisBlock := config.GenesisBlock()
txStatus := bc.NewTransactionStatus()
if err != nil {
return err
}
- return c.store.SaveChainStatus(node, utxoView)
+ return c.store.SaveChainStatus(node, node, utxoView, map[uint64]*state.VoteResult{})
}
// BestBlockHeight returns the current height of the blockchain.
return c.index.InMainchain(hash)
}
-// CalcNextSeed return the seed for the given block
-func (c *Chain) CalcNextSeed(preBlock *bc.Hash) (*bc.Hash, error) {
- node := c.index.GetNode(preBlock)
- if node == nil {
- return nil, errors.New("can't find preblock in the blockindex")
- }
- return node.CalcNextSeed(), nil
-}
-
-// CalcNextBits return the seed for the given block
-func (c *Chain) CalcNextBits(preBlock *bc.Hash) (uint64, error) {
- node := c.index.GetNode(preBlock)
- if node == nil {
- return 0, errors.New("can't find preblock in the blockindex")
- }
- return node.CalcNextBits(), nil
-}
-
// This function must be called with mu lock in above level
-func (c *Chain) setState(node *state.BlockNode, view *state.UtxoViewpoint) error {
- if err := c.store.SaveChainStatus(node, view); err != nil {
+func (c *Chain) setState(node *state.BlockNode, irreversibleNode *state.BlockNode, view *state.UtxoViewpoint, voteMap map[uint64]*state.VoteResult) error {
+ if err := c.store.SaveChainStatus(node, irreversibleNode, view, voteMap); err != nil {
return err
}
c.cond.L.Lock()
defer c.cond.L.Unlock()
+ if err := c.bbft.UpdateConsensusNodes(node.Height); err != nil {
+ return err
+ }
+
c.index.SetMainChain(node)
c.bestNode = node
+ c.bestIrreversibleNode = irreversibleNode
- log.WithFields(log.Fields{"height": c.bestNode.Height, "hash": c.bestNode.Hash.String()}).Debug("chain best status has been update")
+ log.WithFields(log.Fields{"module": logModule, "height": c.bestNode.Height, "hash": c.bestNode.Hash.String()}).Debug("chain best status has been update")
c.cond.Broadcast()
return nil
}