fix(core): Do not propagate blocks if subscribed to blocks from incorrect chain

core/exchange_test.go

@@ -20,7 +20,9 @@ func TestCoreExchange_RequestHeaders(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	t.Cleanup(cancel)
 
-	fetcher, _ := createCoreFetcher(t, DefaultTestConfig())
+	cfg := DefaultTestConfig()
+	cfg.ChainID = networkID
+	fetcher, _ := createCoreFetcher(t, cfg)
 
 	// generate 10 blocks
 	generateBlocks(t, fetcher)

core/listener.go

@@ -23,6 +23,8 @@ import (
 var (
 	tracer                 = otel.Tracer("core/listener")
 	retrySubscriptionDelay = 5 * time.Second
+
+	errInvalidSubscription = errors.New("invalid subscription")
 )
 
 // Listener is responsible for listening to Core for
@@ -41,11 +43,12 @@ type Listener struct {
 	headerBroadcaster libhead.Broadcaster[*header.ExtendedHeader]
 	hashBroadcaster   shrexsub.BroadcastFn
 
-	listenerTimeout time.Duration
-
 	metrics *listenerMetrics
 
-	cancel context.CancelFunc
+	chainID string
+
+	listenerTimeout time.Duration
+	cancel          context.CancelFunc
 }
 
 func NewListener(
@@ -81,6 +84,7 @@ func NewListener(
 		store:             store,
 		listenerTimeout:   5 * blocktime,
 		metrics:           metrics,
+		chainID:           p.chainID,
 	}, nil
 }
 
@@ -117,6 +121,10 @@ func (cl *Listener) runSubscriber(ctx context.Context, sub <-chan types.EventDat
 			// listener stopped because external context was canceled
 			return
 		}
+		if errors.Is(err, errInvalidSubscription) {
+			// stop node if there is a critical issue with the block subscription
+			log.Fatalf("listener: %v", err)
+		}
 
 		log.Warnw("listener: subscriber error, resubscribing...", "err", err)
 		sub = cl.resubscribe(ctx)
@@ -163,6 +171,12 @@ func (cl *Listener) listen(ctx context.Context, sub <-chan types.EventDataSigned
 				return errors.New("underlying subscription was closed")
 			}
 
+			if cl.chainID != "" && b.Header.ChainID != cl.chainID {
+				log.Errorf("listener: received block with unexpected chain ID: expected %s,"+
+					" received %s", cl.chainID, b.Header.ChainID)
+				return errInvalidSubscription
+			}
+
 			log.Debugw("listener: new block from core", "height", b.Header.Height)
 
 			err := cl.handleNewSignedBlock(ctx, b)

core/listener_test.go

@@ -47,10 +47,14 @@ func TestListener(t *testing.T) {
 	t.Cleanup(subs.Cancel)
 
 	// create one block to store as Head in local store and then unsubscribe from block events
-	fetcher, _ := createCoreFetcher(t, DefaultTestConfig())
+	cfg := DefaultTestConfig()
+	cfg.ChainID = networkID
+	fetcher, _ := createCoreFetcher(t, cfg)
+
 	eds := createEdsPubSub(ctx, t)
+
 	// create Listener and start listening
-	cl := createListener(ctx, t, fetcher, ps0, eds, createStore(t))
+	cl := createListener(ctx, t, fetcher, ps0, eds, createStore(t), networkID)
 	err = cl.Start(ctx)
 	require.NoError(t, err)
 
@@ -80,6 +84,7 @@ func TestListenerWithNonEmptyBlocks(t *testing.T) {
 
 	// create one block to store as Head in local store and then unsubscribe from block events
 	cfg := DefaultTestConfig()
+	cfg.ChainID = networkID
 	fetcher, cctx := createCoreFetcher(t, cfg)
 	eds := createEdsPubSub(ctx, t)
 
@@ -92,7 +97,7 @@ func TestListenerWithNonEmptyBlocks(t *testing.T) {
 	})
 
 	// create Listener and start listening
-	cl := createListener(ctx, t, fetcher, ps0, eds, store)
+	cl := createListener(ctx, t, fetcher, ps0, eds, store, networkID)
 	err = cl.Start(ctx)
 	require.NoError(t, err)
 
@@ -124,6 +129,36 @@ func TestListenerWithNonEmptyBlocks(t *testing.T) {
 	require.Nil(t, cl.cancel)
 }
 
+func TestListenerWithWrongChainRPC(t *testing.T) {
+	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
+	t.Cleanup(cancel)
+
+	// create mocknet with two pubsub endpoints
+	ps0, _ := createMocknetWithTwoPubsubEndpoints(ctx, t)
+
+	// create one block to store as Head in local store and then unsubscribe from block events
+	cfg := DefaultTestConfig()
+	cfg.ChainID = networkID
+	fetcher, _ := createCoreFetcher(t, cfg)
+	eds := createEdsPubSub(ctx, t)
+
+	store := createStore(t)
+	err := store.Start(ctx)
+	require.NoError(t, err)
+	t.Cleanup(func() {
+		err = store.Stop(ctx)
+		require.NoError(t, err)
+	})
+
+	// create Listener and start listening
+	cl := createListener(ctx, t, fetcher, ps0, eds, store, "wrong-chain-rpc")
+	sub, err := cl.fetcher.SubscribeNewBlockEvent(ctx)
+	require.NoError(t, err)
+
+	err = cl.listen(ctx, sub)
+	assert.ErrorIs(t, err, errInvalidSubscription)
+}
+
 func createMocknetWithTwoPubsubEndpoints(ctx context.Context, t *testing.T) (*pubsub.PubSub, *pubsub.PubSub) {
 	net, err := mocknet.FullMeshLinked(2)
 	require.NoError(t, err)
@@ -166,6 +201,7 @@ func createListener(
 	ps *pubsub.PubSub,
 	edsSub *shrexsub.PubSub,
 	store *eds.Store,
+	chainID string,
 ) *Listener {
 	p2pSub, err := p2p.NewSubscriber[*header.ExtendedHeader](ps, header.MsgID, p2p.WithSubscriberNetworkID(networkID))
 	require.NoError(t, err)
@@ -180,7 +216,8 @@ func createListener(
 		require.NoError(t, p2pSub.Stop(ctx))
 	})
 
-	listener, err := NewListener(p2pSub, fetcher, edsSub.Broadcast, header.MakeExtendedHeader, store, nodep2p.BlockTime)
+	listener, err := NewListener(p2pSub, fetcher, edsSub.Broadcast, header.MakeExtendedHeader,
+		store, nodep2p.BlockTime, WithChainID(nodep2p.Network(chainID)))
 	require.NoError(t, err)
 	return listener
 }

core/option.go

@@ -1,9 +1,13 @@
 package core
 
+import "github.com/celestiaorg/celestia-node/nodebuilder/p2p"
+
 type Option func(*params)
 
 type params struct {
 	metrics bool
+
+	chainID string
 }
 
 // WithMetrics is a functional option that enables metrics
@@ -13,3 +17,9 @@ func WithMetrics() Option {
 		p.metrics = true
 	}
 }
+
+func WithChainID(id p2p.Network) Option {
+	return func(p *params) {
+		p.chainID = id.String()
+	}
+}

libs/utils/resetctx.go

@@ -1,6 +1,8 @@
 package utils
 
-import "context"
+import (
+	"context"
+)
 
 // ResetContextOnError returns a fresh context if the given context has an error.
 func ResetContextOnError(ctx context.Context) context.Context {

nodebuilder/core/module.go

@@ -56,8 +56,9 @@ func ConstructModule(tp node.Type, cfg *Config, options ...fx.Option) fx.Option
 					pubsub *shrexsub.PubSub,
 					construct header.ConstructFn,
 					store *eds.Store,
+					chainID p2p.Network,
 				) (*core.Listener, error) {
-					var opts []core.Option
+					opts := []core.Option{core.WithChainID(chainID)}
 					if MetricsEnabled {
 						opts = append(opts, core.WithMetrics())
 					}