From cbfa1153f5aee3cc8cadc1e032330b6a9daf4673 Mon Sep 17 00:00:00 2001
From: rene <41963722+renaynay@users.noreply.github.com>
Date: Thu, 27 Apr 2023 15:26:54 +0200
Subject: [PATCH 1/3] feat(header): Check app version in eh validation and
 return err on mismatch

---
 header/header.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/header/header.go b/header/header.go
index 25c3b0e5cf..e59d3802c1 100644
--- a/header/header.go
+++ b/header/header.go
@@ -10,6 +10,7 @@ import (
 	tmjson "github.com/tendermint/tendermint/libs/json"
 	core "github.com/tendermint/tendermint/types"
 
+	"github.com/celestiaorg/celestia-app/pkg/appconsts"
 	"github.com/celestiaorg/celestia-app/pkg/da"
 	libhead "github.com/celestiaorg/go-header"
 	"github.com/celestiaorg/rsmt2d"
@@ -115,6 +116,11 @@ func (eh *ExtendedHeader) Validate() error {
 		return fmt.Errorf("ValidateBasic error on RawHeader at height %d: %w", eh.Height(), err)
 	}
 
+	if eh.RawHeader.Version.App != appconsts.LatestVersion {
+		return fmt.Errorf("app version mismatch, expected: %d, got %d", appconsts.LatestVersion,
+			eh.RawHeader.Version.App)
+	}
+
 	err = eh.Commit.ValidateBasic()
 	if err != nil {
 		return fmt.Errorf("ValidateBasic error on Commit at height %d: %w", eh.Height(), err)

From 72670e26f80a0cc670f79ad8faf6364c2dc5ae9f Mon Sep 17 00:00:00 2001
From: rene <41963722+renaynay@users.noreply.github.com>
Date: Thu, 15 Jun 2023 16:26:05 +0200
Subject: [PATCH 2/3] test(header/headertest): Add app version mismatch case in
 test

---
 header/headertest/verify_test.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/header/headertest/verify_test.go b/header/headertest/verify_test.go
index 78da779a54..177352a4cf 100644
--- a/header/headertest/verify_test.go
+++ b/header/headertest/verify_test.go
@@ -8,6 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	tmrand "github.com/tendermint/tendermint/libs/rand"
 
+	"github.com/celestiaorg/celestia-app/pkg/appconsts"
 	libhead "github.com/celestiaorg/go-header"
 )
 
@@ -80,6 +81,13 @@ func TestVerify(t *testing.T) {
 			},
 			err: true,
 		},
+		{
+			prepare: func() libhead.Header {
+				untrustedAdj.RawHeader.Version.App = appconsts.LatestVersion + 1
+				return untrustedAdj
+			},
+			err: true,
+		},
 	}
 
 	for i, test := range tests {

From 7d1aa3818232cbff6251fc18ac5253a9c3f9b6a5 Mon Sep 17 00:00:00 2001
From: rene <41963722+renaynay@users.noreply.github.com>
Date: Fri, 16 Jun 2023 15:40:17 +0200
Subject: [PATCH 3/3] fix(go.mod): Bump sdk replace

---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 9628a0c205..c381d15dc7 100644
--- a/go.mod
+++ b/go.mod
@@ -330,7 +330,7 @@ require (
 )
 
 replace (
-	github.com/cosmos/cosmos-sdk => github.com/celestiaorg/cosmos-sdk v1.13.0-sdk-v0.46.11
+	github.com/cosmos/cosmos-sdk => github.com/celestiaorg/cosmos-sdk v1.14.0-sdk-v0.46.11
 	github.com/filecoin-project/dagstore => github.com/celestiaorg/dagstore v0.0.0-20230413141458-735ab09a15d6
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 	github.com/tendermint/tendermint => github.com/celestiaorg/celestia-core v1.21.2-tm-v0.34.27
diff --git a/go.sum b/go.sum
index bf659652b4..395af7c822 100644
--- a/go.sum
+++ b/go.sum
@@ -345,8 +345,8 @@ github.com/celestiaorg/celestia-app v1.0.0-rc2 h1:/u7eespYtBpQtBSz3P8/rKfz9rW7QO
 github.com/celestiaorg/celestia-app v1.0.0-rc2/go.mod h1:uiTWKTtRpVwvSiFDl2zausrU1ZBHBWgk7z52pfzJqJU=
 github.com/celestiaorg/celestia-core v1.21.2-tm-v0.34.27 h1:nmr9O5BflgNR1aWehs1ZFw4obA//M/+g+SrSMK9sOBA=
 github.com/celestiaorg/celestia-core v1.21.2-tm-v0.34.27/go.mod h1:GVo91Wifg9KL/nFx9nPkpl0UIFdvvs4fhnly9GhGxZU=
-github.com/celestiaorg/cosmos-sdk v1.13.0-sdk-v0.46.11 h1:Rd5EvJx1nG3KurBspVN51RVmvif0Lp2UVURbG2ad3Cs=
-github.com/celestiaorg/cosmos-sdk v1.13.0-sdk-v0.46.11/go.mod h1:xCG6OUkJy5KUMEg20Zk010lra9XjkmKS3+bk0wp7bd8=
+github.com/celestiaorg/cosmos-sdk v1.14.0-sdk-v0.46.11 h1:xDLC0ZvIwj9S2gTs9b8EespilL/u/vOGcqJuHz1r/eA=
+github.com/celestiaorg/cosmos-sdk v1.14.0-sdk-v0.46.11/go.mod h1:IwvD2nN3vEMkjxhTw/SF5tyJ0+x3GB0EdyQJyteK06U=
 github.com/celestiaorg/dagstore v0.0.0-20230413141458-735ab09a15d6 h1:/yCwMCoOPcYCiG18u8/1pv5eXF04xczoQO3sR0bKsgM=
 github.com/celestiaorg/dagstore v0.0.0-20230413141458-735ab09a15d6/go.mod h1:ta/DlqIH10bvhwqJIw51Nq3QU4XVMp6pz3f0Deve9fM=
 github.com/celestiaorg/go-fraud v0.1.0 h1:v6mZvlmf2J5ELZfPnrtmmOvKbaYIUs/erDWPO8NbZyY=