From 1820953d6a4c646900e1e8e2bc903030c591165b Mon Sep 17 00:00:00 2001
From: Jerry <jerrycgh@gmail.com>
Date: Thu, 24 Oct 2024 12:05:57 -0700
Subject: [PATCH] Fix panic on nil block in ethstats

---
 ethstats/ethstats.go      |  4 +++
 ethstats/ethstats_test.go | 69 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go
index ef21292365..cd6c34352e 100644
--- a/ethstats/ethstats.go
+++ b/ethstats/ethstats.go
@@ -729,6 +729,10 @@ func (s *Service) assembleBlockStats(block *types.Block) *blockStats {
 			}
 		}
 
+		if block == nil {
+			return nil
+		}
+
 		header = block.Header()
 		td = fullBackend.GetTd(context.Background(), header.Hash())
 
diff --git a/ethstats/ethstats_test.go b/ethstats/ethstats_test.go
index 2237470fca..aed4356f4a 100644
--- a/ethstats/ethstats_test.go
+++ b/ethstats/ethstats_test.go
@@ -17,8 +17,17 @@
 package ethstats
 
 import (
+	"context"
+	"math/big"
 	"strconv"
 	"testing"
+
+	"github.com/ethereum/go-ethereum"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/event"
+	"github.com/ethereum/go-ethereum/rpc"
 )
 
 func TestParseEthstatsURL(t *testing.T) {
@@ -83,3 +92,63 @@ func TestParseEthstatsURL(t *testing.T) {
 		}
 	}
 }
+
+// MockBackend is a mock implementation of the backend interface
+type MockFullNodeBackend struct{}
+
+func (m *MockFullNodeBackend) SubscribeChainHeadEvent(ch chan<- core.ChainHeadEvent) event.Subscription {
+	return nil
+}
+
+func (m *MockFullNodeBackend) SubscribeNewTxsEvent(ch chan<- core.NewTxsEvent) event.Subscription {
+	return nil
+}
+
+func (m *MockFullNodeBackend) CurrentHeader() *types.Header {
+	return &types.Header{}
+}
+
+func (m *MockFullNodeBackend) HeaderByNumber(ctx context.Context, number rpc.BlockNumber) (*types.Header, error) {
+	return nil, nil
+}
+
+func (m *MockFullNodeBackend) GetTd(ctx context.Context, hash common.Hash) *big.Int {
+	return big.NewInt(0)
+}
+
+func (m *MockFullNodeBackend) Stats() (pending int, queued int) {
+	return 0, 0
+}
+
+func (m *MockFullNodeBackend) SyncProgress() ethereum.SyncProgress {
+	return ethereum.SyncProgress{}
+}
+
+func (m *MockFullNodeBackend) SubscribeChain2HeadEvent(ch chan<- core.Chain2HeadEvent) event.Subscription {
+	return nil
+}
+
+func (m *MockFullNodeBackend) BlockByNumber(ctx context.Context, number rpc.BlockNumber) (*types.Block, error) {
+	return nil, nil
+}
+
+func (m *MockFullNodeBackend) CurrentBlock() *types.Header {
+	return &types.Header{Number: big.NewInt(1)}
+}
+
+func (m *MockFullNodeBackend) SuggestGasTipCap(ctx context.Context) (*big.Int, error) {
+	return big.NewInt(0), nil
+}
+
+func TestAssembleBlockStats_NilBlock(t *testing.T) {
+	mockBackend := &MockFullNodeBackend{}
+	service := &Service{
+		backend: mockBackend,
+	}
+
+	result := service.assembleBlockStats(nil)
+
+	if result != nil {
+		t.Errorf("Expected nil, got %v", result)
+	}
+}