fix(bpos): discrete mining can include illegal proposal and vote

blockchain/blockchain.go

@@ -1552,6 +1552,7 @@ func (b *BlockChain) connectBlock(node *BlockNode, block *Block, confirm *payloa
 	// Notify the caller that the block was connected to the main chain.
 	// The caller would typically want to react with actions such as
 	// updating wallets.
+	//todo add go
 	events.Notify(events.ETBlockConnected, block)
 
 	return nil

core/checkpoint/manager.go

@@ -356,18 +356,36 @@ func (m *Manager) onBlockSaved(block *types.DposBlock,
 			}
 		}
 
-		if block.Height >=
-			originalHeight+v.SavePeriod() {
-			v.SetHeight(block.Height)
-			snapshot := v.Snapshot()
-			if snapshot == nil {
-				log.Error("snapshot is nil, key:", v.Key())
-				continue
-			}
-			reply := make(chan bool, 1)
-			m.channels[v.Key()].Save(snapshot, reply)
-			if !async {
-				<-reply
+		if v.Key() == txpoolCheckpointKey {
+			go func() {
+				if block.Height >=
+					originalHeight+v.SavePeriod() {
+					v.SetHeight(block.Height)
+					snapshot := v.Snapshot()
+					if snapshot == nil {
+						log.Error("snapshot is nil, key:", v.Key())
+					}
+					reply := make(chan bool, 1)
+					m.channels[v.Key()].Save(snapshot, reply)
+					if !async {
+						<-reply
+					}
+				}
+			}()
+		} else {
+			if block.Height >=
+				originalHeight+v.SavePeriod() {
+				v.SetHeight(block.Height)
+				snapshot := v.Snapshot()
+				if snapshot == nil {
+					log.Error("snapshot is nil, key:", v.Key())
+					continue
+				}
+				reply := make(chan bool, 1)
+				m.channels[v.Key()].Save(snapshot, reply)
+				if !async {
+					<-reply
+				}
 			}
 		}
 	}

events/events.go

@@ -106,17 +106,17 @@ func (n EventType) String() string {
 // Event defines notification that is sent to the caller via the callback
 // function provided during the call to New and consists of a notification type
 // as well as associated data that depends on the type as follows:
-// 	- ETBlockAccepted:     *types.Block
-// 	- ETBlockConnected:    *types.Block
-// 	- ETBlockDisconnected: *types.Block
-// 	- ETTransactionAccepted: *types.BaseTransaction
+//   - ETBlockAccepted:     *types.Block
+//   - ETBlockConnected:    *types.Block
+//   - ETBlockDisconnected: *types.Block
+//   - ETTransactionAccepted: *types.BaseTransaction
 type Event struct {
 	Type EventType
 	Data interface{}
 }
 
 var events struct {
-	mtx       sync.Mutex
+	mtx       sync.RWMutex
 	callbacks []EventCallback
 }
 
@@ -150,12 +150,12 @@ func Notify(typ EventType, data interface{}) {
 	mutex.Unlock()
 
 	// Generate and send the notification.
-	events.mtx.Lock()
+	events.mtx.RLock()
 	n := Event{Type: typ, Data: data}
 	for _, callback := range events.callbacks {
 		callback(&n)
 	}
-	events.mtx.Unlock()
+	events.mtx.RUnlock()
 
 	// Reset notify count.
 	mutex.Lock()

pow/service.go

@@ -308,9 +308,9 @@ func (pow *Service) GenerateBlock(minerAddr string,
 	var proposalsUsedAmount common.Fixed64
 	for _, tx := range txs {
 
-		if tx.IsIllegalProposalTx() || tx.IsIllegalVoteTx() {
-			continue
-		}
+		//if tx.IsIllegalProposalTx() || tx.IsIllegalVoteTx() {
+		//	continue
+		//}
 
 		size := totalTxsSize + tx.GetSize()
 		if size > int(pact.MaxBlockContextSize) {