fix:handle empty block punish logic

erbieio · Sep 14, 2023 · e220b48 · e220b48
1 parent 7c10cff
commit e220b48
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/consensus/istanbul/ibft/engine/engine.go b/consensus/istanbul/ibft/engine/engine.go
@@ -1106,19 +1106,15 @@ func (e *Engine) pickEvilValidatorsV2(bc *core.BlockChain, ea *types.EvilAction)
 		return totalSigners
 	}
 
-	if canonicalHeader.Coinbase == (common.Address{}) {
-		log.Info("the standard block is an empty block and will not be processed", "height", canonicalNo)
-		return totalSigners
-	}
-
-	canonicalSigners, err := e.Signers(canonicalHeader)
-	if err != nil {
-		log.Error("failed to recover block signers", "height", canonicalNo)
-		return totalSigners
+	if canonicalHeader.Coinbase != (common.Address{}) {
+		canonicalSigners, err := e.Signers(canonicalHeader)
+		if err != nil {
+			log.Error("failed to recover block signers", "height", canonicalNo)
+			return totalSigners
+		}
+		totalSigners = append(totalSigners, canonicalSigners...)
 	}
 
-	totalSigners = append(totalSigners, canonicalSigners...)
-
 	for _, header := range ea.EvilHeaders {
 		log.Info("pickEvilValidators", "evil-no", header.Number.Uint64(), "evil-hash", header.Hash().Hex())
 		signers, err := e.Signers(header)

diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -1346,10 +1346,6 @@ func (s *PublicBlockChainAPI) GetPunishedInfo(ctx context.Context, number rpc.Bl
 		return nil, errors.New("invalid block number")
 	}
 
-	if canonicalHeader.Coinbase == (common.Address{}) {
-		return nil, nil
-	}
-
 	return pickEvilValidatorsV2(ctx, canonicalHeader, evilAction, engine)
 }