fix the solo net

diff --git a/proposal/blockproposer/blockproposer.go b/proposal/blockproposer/blockproposer.go
index cd84e70..13ebf17 100644 (file)
--- a/proposal/blockproposer/blockproposer.go
+++ b/proposal/blockproposer/blockproposer.go
@@ -57,8 +57,13 @@ func (b *BlockProposer) generateBlocks() {
                        nextBlockTime = minNextBlockTime
                }
 
-               if isBlocker, err := b.chain.IsBlocker(&bestBlockHash, xpubStr, nextBlockTime); !isBlocker {
-                       log.WithFields(log.Fields{"module": logModule, "error": err, "pubKey": xpubStr}).Debug("fail on check is next blocker")
+               isBlocker, err := b.chain.IsBlocker(&bestBlockHash, xpubStr, nextBlockTime)
+               if err != nil {
+                       log.WithFields(log.Fields{"module": logModule, "error": err, "pubKey": xpubStr}).Error("fail on check is next blocker")
+                       continue
+               }
+
+               if !isBlocker {
                        continue
                }
 

diff --git a/protocol/consensus_node_manager.go b/protocol/consensus_node_manager.go
index dd98cff..8d008fb 100644 (file)
--- a/protocol/consensus_node_manager.go
+++ b/protocol/consensus_node_manager.go
@@ -88,7 +88,7 @@ func (c *consensusNodeManager) getConsensusNodes(prevBlockHash *bc.Hash) (map[st
        }
 
        seqHeight := prevBlockNode.Height + 1
-       if bestHeight := c.blockIndex.BestNode().Height; bestHeight < seqHeight {
+       if bestHeight := c.blockIndex.BestNode().Height; bestHeight < seqHeight && bestHeight != 0 {
                seqHeight = bestHeight
        }
 
@@ -115,6 +115,10 @@ func (c *consensusNodeManager) getConsensusNodes(prevBlockHash *bc.Hash) (map[st
 
 func (c *consensusNodeManager) getBestVoteResult() (*state.VoteResult, error) {
        blockNode := c.blockIndex.BestNode()
+       if blockNode.Height == 0 {
+               return c.store.GetVoteResult(0)
+       }
+
        seq := (blockNode.Height-1)/consensus.RoundVoteBlockNums + 1
        voteResult, err := c.store.GetVoteResult(seq)
        if err != nil {