fix: only overwrite context chainID when necessary (backport #22568) (#22569)

Co-authored-by: Damian Nolan <damiannolan@gmail.com>

types/context.go

@@ -2,6 +2,7 @@ package types
 
 import (
 	"context"
+	"strings"
 	"time"
 
 	abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
@@ -162,7 +163,10 @@ func (c Context) WithBlockHeader(header cmtproto.Header) Context {
 	c.header = header
 
 	// when calling withBlockheader on a new context, chainID in the struct will be empty
-	c.chainID = header.ChainID
+	if strings.TrimSpace(c.chainID) == "" {
+		c.chainID = header.ChainID
+	}
+
 	return c
 }