From 0cf385509aa6d47ee9eec7d8a5f50ea503ec957c Mon Sep 17 00:00:00 2001
From: MSalopek <matija.salopek994@gmail.com>
Date: Thu, 22 Jun 2023 15:59:19 +0200
Subject: [PATCH] fix: fix broken sovereign app.go

---
 app/consumer-democracy/app.go | 3 ---
 app/consumer/app.go           | 2 --
 app/provider/app.go           | 3 ---
 app/sovereign/app.go          | 7 +++++--
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/consumer-democracy/app.go b/app/consumer-democracy/app.go
index 298087262d..6b3078212b 100644
--- a/app/consumer-democracy/app.go
+++ b/app/consumer-democracy/app.go
@@ -116,9 +116,6 @@ import (
 	consumer "github.com/cosmos/interchain-security/v3/x/ccv/consumer"
 	consumerkeeper "github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper"
 	consumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
-
-	// unnamed import of statik for swagger UI support
-	_ "github.com/cosmos/cosmos-sdk/client/docs/statik"
 )
 
 const (
diff --git a/app/consumer/app.go b/app/consumer/app.go
index 20b6695dfa..17c15c2c86 100644
--- a/app/consumer/app.go
+++ b/app/consumer/app.go
@@ -91,8 +91,6 @@ import (
 	ibcconsumerkeeper "github.com/cosmos/interchain-security/v3/x/ccv/consumer/keeper"
 	ibcconsumertypes "github.com/cosmos/interchain-security/v3/x/ccv/consumer/types"
 
-	// unnamed import of statik for swagger UI support
-	_ "github.com/cosmos/cosmos-sdk/client/docs/statik"
 	testutil "github.com/cosmos/interchain-security/v3/testutil/integration"
 )
 
diff --git a/app/provider/app.go b/app/provider/app.go
index 3fefd34daa..d810ff360f 100644
--- a/app/provider/app.go
+++ b/app/provider/app.go
@@ -109,9 +109,6 @@ import (
 	providertypes "github.com/cosmos/interchain-security/v3/x/ccv/provider/types"
 
 	testutil "github.com/cosmos/interchain-security/v3/testutil/integration"
-
-	// unnamed import of statik for swagger UI support
-	_ "github.com/cosmos/cosmos-sdk/client/docs/statik"
 )
 
 const (
diff --git a/app/sovereign/app.go b/app/sovereign/app.go
index e616b92514..83bc92de2c 100644
--- a/app/sovereign/app.go
+++ b/app/sovereign/app.go
@@ -108,6 +108,7 @@ import (
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
 
 	paramproposal "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
+	tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
 )
 
 const (
@@ -125,7 +126,7 @@ var (
 	// and genesis verification.
 	ModuleBasics = module.NewBasicManager(
 		auth.AppModuleBasic{},
-		genutil.AppModuleBasic{},
+		genutil.NewAppModuleBasic(genutiltypes.DefaultMessageValidator),
 		bank.AppModuleBasic{},
 		capability.AppModuleBasic{},
 		sdkstaking.AppModuleBasic{},
@@ -148,6 +149,7 @@ var (
 		evidence.AppModuleBasic{},
 		transfer.AppModuleBasic{},
 		vesting.AppModuleBasic{},
+		tendermint.AppModuleBasic{},
 	)
 
 	// module account permissions
@@ -246,7 +248,7 @@ func New(
 	bApp.SetInterfaceRegistry(interfaceRegistry)
 
 	keys := sdk.NewKVStoreKeys(
-		authtypes.StoreKey, banktypes.StoreKey, stakingtypes.StoreKey,
+		authtypes.StoreKey, banktypes.StoreKey, stakingtypes.StoreKey, crisistypes.StoreKey,
 		minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey,
 		govtypes.StoreKey, paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey,
 		evidencetypes.StoreKey, ibctransfertypes.StoreKey,
@@ -263,6 +265,7 @@ func New(
 		keys:              keys,
 		tkeys:             tkeys,
 		memKeys:           memKeys,
+		txConfig:          encodingConfig.TxConfig,
 	}
 
 	app.ParamsKeeper = initParamsKeeper(