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

(cherry picked from commit 50c5963)
cosmos · Nov 20, 2024 · afbfe67 · afbfe67
1 parent 088c8d1
commit afbfe67
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/types/context.go b/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
 }