782 missing blocks fix (#783)

* #782 validate block in scanBlockPool thread

* #782 fix wrong function signature causing interface not implemented

* #782 move chain lock to beginning of ScanBlockPool function

Co-authored-by: Ahmad Ali Abdilah <[email protected]>

Author: andy-shi88

core/service/blockMainService.go

@@ -40,8 +40,6 @@ type (
 			timestamp, totalAmount, totalFee, totalCoinBase int64,
 			transactions []*model.Transaction,
 			blockReceipts []*model.PublishedReceipt,
-			payloadHash []byte,
-			payloadLength uint32,
 			secretPhrase string,
 		) (*model.Block, error)
 		RemoveMempoolTransactions(transactions []*model.Transaction) error
@@ -639,6 +637,8 @@ func (bs *BlockService) PushBlock(previousBlock, block *model.Block, broadcast,
 
 // ScanBlockPool scan the whole block pool to check if there are any block that's legal to be pushed yet
 func (bs *BlockService) ScanBlockPool() error {
+	bs.ChainWriteLock(constant.BlockchainStatusReceivingBlock)
+	defer bs.ChainWriteUnlock(constant.BlockchainStatusReceivingBlock)
 	previousBlock, err := bs.GetLastBlock()
 	if err != nil {
 		return err
@@ -648,13 +648,16 @@ func (bs *BlockService) ScanBlockPool() error {
 	for index, block := range blocks {
 		err = bs.BlocksmithStrategy.CanPersistBlock(index, int64(len(blocksmithsMap)), previousBlock)
 		if err == nil {
-			err := func(block *model.Block) error {
-				bs.ChainWriteLock(constant.BlockchainStatusReceivingBlock)
-				defer bs.ChainWriteUnlock(constant.BlockchainStatusReceivingBlock)
-				err := bs.PushBlock(previousBlock, block, true, true)
-				return err
-			}(block)
+			err := bs.ValidateBlock(block, previousBlock)
+			if err != nil {
+				bs.Logger.Warnf("ScanBlockPool:blockValidationFail: %v\n", err)
+				return blocker.NewBlocker(
+					blocker.BlockErr, "ScanBlockPool:ValidateBlockFail",
+				)
+			}
+			err = bs.PushBlock(previousBlock, block, true, true)
 			if err != nil {
+				bs.Logger.Warnf("ScanBlockPool:PushBlockFail: %v\n", err)
 				return blocker.NewBlocker(
 					blocker.BlockErr, "ScanBlockPool:PushBlockFail",
 				)