log "github.com/sirupsen/logrus"
"github.com/vapor/config"
+ "github.com/vapor/event"
"github.com/vapor/protocol/bc"
"github.com/vapor/protocol/bc/types"
"github.com/vapor/protocol/state"
+ "github.com/vapor/common"
)
const maxProcessBlockChSize = 1024
orphanManage *OrphanManage
txPool *TxPool
store Store
- bbft *bbft
processBlockCh chan *processBlockMsg
+ consensusNodeManager *consensusNodeManager
+ signatureCache *common.Cache
+ eventDispatcher *event.Dispatcher
+
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,
- store: store,
- processBlockCh: make(chan *processBlockMsg, maxProcessBlockChSize),
+ orphanManage: NewOrphanManage(),
+ txPool: txPool,
+ store: store,
+ signatureCache: common.NewCache(maxSignatureCacheSize),
+ eventDispatcher: eventDispatcher,
+ processBlockCh: make(chan *processBlockMsg, maxProcessBlockChSize),
}
c.cond.L = new(sync.Mutex)
}
c.bestNode = c.index.GetNode(storeStatus.Hash)
+ c.bestIrreversibleNode = c.index.GetNode(storeStatus.IrreversibleHash)
+ c.consensusNodeManager = newConsensusNodeManager(store, c.index)
c.index.SetMainChain(c.bestNode)
- c.bbft = newBbft(store, c.index)
go c.blockProcesser()
return c, nil
}
return err
}
+ voteResults := []*state.VoteResult{&state.VoteResult{
+ Seq: 0,
+ NumOfVote: map[string]uint64{},
+ BlockHash: genesisBlock.Hash(),
+ BlockHeight: 0,
+ }}
node, err := state.NewBlockNode(&genesisBlock.BlockHeader, nil)
if err != nil {
return err
}
- return c.store.SaveChainStatus(node, node, utxoView, map[uint64]*state.VoteResult{})
+
+ return c.store.SaveChainStatus(node, node, utxoView, voteResults)
}
// BestBlockHeight returns the current height of the blockchain.
}
// This function must be called with mu lock in above level
-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 {
+func (c *Chain) setState(node, irreversibleNode *state.BlockNode, view *state.UtxoViewpoint, voteResults []*state.VoteResult) error {
+ if err := c.store.SaveChainStatus(node, irreversibleNode, view, voteResults); err != nil {
return err
}