Merge pull request #85 from bnb-chain/develop

release: prepare for v0.2.4-hf.1
bnb-chain · Sep 1, 2023 · 67d2d5c · 67d2d5c
2 parents 4b400b3 + 3c29eb7
commit 67d2d5c
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/executor/bsc_executor.go b/executor/bsc_executor.go
@@ -599,8 +599,10 @@ func (e *BSCExecutor) ClaimRewardLoop() {
 // getFinalizedBlockHeight gets the finalizedBlockHeight, which is the larger one between (fastFinalizedBlockHeight, NumberOfBlocksForFinality from config).
 func (e *BSCExecutor) getFinalizedBlockHeight(ctx context.Context, rpcClient *rpc.Client) (uint64, error) {
 	var head *types.Header
-	err := rpcClient.CallContext(ctx, &head, "eth_getFinalizedHeader", e.config.BSCConfig.NumberOfBlocksForFinality)
-	if err == nil && head == nil {
+	if err := rpcClient.CallContext(ctx, &head, "eth_getFinalizedHeader", e.config.BSCConfig.NumberOfBlocksForFinality); err != nil {
+		return 0, err
+	}
+	if head == nil || head.Number == nil {
 		return 0, ethereum.NotFound
 	}
 	return head.Number.Uint64(), nil