From f4f51016a14c2dbf5e4742a89f1d44148ff9bc67 Mon Sep 17 00:00:00 2001
From: Spoorthi <9302666+spoo-bar@users.noreply.github.com>
Date: Fri, 30 Aug 2024 15:04:07 +0100
Subject: [PATCH] fixing bech32 codec references

---
 .github/workflows/e2e-tests.yaml |  2 +-
 e2e/utils.go                     |  2 +-
 simapp/app.go                    | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
index fa7ef89..2f8716f 100644
--- a/.github/workflows/e2e-tests.yaml
+++ b/.github/workflows/e2e-tests.yaml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Build Docker Image
-        uses: strangelove-ventures/heighliner-build-action@v1.0.2
+        uses: strangelove-ventures/heighliner-build-action@v1.0.3
         with:
           registry: "" # empty registry, image only shared for e2e testing
           tag: local # emulate local environment for consistency in interchaintest cases
diff --git a/e2e/utils.go b/e2e/utils.go
index c06279c..1ea5afa 100644
--- a/e2e/utils.go
+++ b/e2e/utils.go
@@ -142,7 +142,7 @@ func Suite(t *testing.T, wrapper *Wrapper, ibcEnabled bool) (ctx context.Context
 	if ibcEnabled {
 		specs = append(specs, &interchaintest.ChainSpec{
 			Name:          "ibc-go-simd",
-			Version:       "v4.5.0",
+			Version:       "v8.5.0",
 			NumValidators: &numValidators,
 			NumFullNodes:  &numFullNodes,
 			ChainConfig: ibc.ChainConfig{
diff --git a/simapp/app.go b/simapp/app.go
index 5f350ea..49b9e97 100644
--- a/simapp/app.go
+++ b/simapp/app.go
@@ -49,6 +49,7 @@ import (
 	consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
+	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	"github.com/cosmos/cosmos-sdk/x/params"
 	paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper"
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
@@ -205,7 +206,7 @@ func NewSimApp(
 		mkeys:             mkeys,
 		tkeys:             tkeys,
 	}
-	authorityAddress := ""
+	authorityAddress := authtypes.NewModuleAddress(govtypes.ModuleName).String()
 
 	app.ParamsKeeper = initParamsKeeper(appCodec, legacyAmino, keys[paramstypes.StoreKey], tkeys[paramstypes.TStoreKey])
 	// set the BaseApp's parameter store
@@ -221,8 +222,8 @@ func NewSimApp(
 		runtime.NewKVStoreService(keys[authtypes.StoreKey]),
 		authtypes.ProtoBaseAccount,
 		permissions,
-		authcodec.NewBech32Codec(sdk.Bech32MainPrefix),
-		sdk.Bech32MainPrefix,
+		authcodec.NewBech32Codec(sdk.GetConfig().GetBech32AccountAddrPrefix()),
+		sdk.GetConfig().GetBech32AccountAddrPrefix(),
 		authorityAddress,
 	)
 
@@ -246,8 +247,8 @@ func NewSimApp(
 		app.AccountKeeper,
 		app.BankKeeper,
 		authorityAddress,
-		authcodec.NewBech32Codec(sdk.Bech32PrefixValAddr),
-		authcodec.NewBech32Codec(sdk.Bech32PrefixConsAddr),
+		authcodec.NewBech32Codec(sdk.GetConfig().GetBech32ValidatorAddrPrefix()),
+		authcodec.NewBech32Codec(sdk.GetConfig().GetBech32ConsensusAddrPrefix()),
 	)
 
 	app.UpgradeKeeper = *upgradekeeper.NewKeeper(