chore!: Bump ibc-go (cosmos#762)

* Bump to latest deps

* Fix lints

* Update

* Tidy systemtests

* Fix tests

* Bump to latest ibc-go

* Point to latest SDK deps

* Bump systemtest versions

* Remove replace in systemtests

---------

Co-authored-by: Alex | Cosmos Labs <[email protected]>

Author: Eric-Warehime

evmd/app.go

@@ -4,11 +4,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-
 	"io"
-
 	"os"
 
+
 	"github.com/spf13/cast"
 
 	// Force-load the tracer engines to trigger registration due to Go-Ethereum v1.10.15 changes
@@ -246,6 +245,10 @@ func NewExampleApp(
 	)
 
 	tkeys := storetypes.NewTransientStoreKeys(evmtypes.TransientKey, feemarkettypes.TransientKey)
+	var nonTransientKeys []storetypes.StoreKey
+	for _, k := range keys {
+		nonTransientKeys = append(nonTransientKeys, k)
+	}
 
 	// load state streaming if enabled
 	if err := bApp.RegisterStreamingServices(appOpts, keys); err != nil {
@@ -388,7 +391,6 @@ func NewExampleApp(
 	app.IBCKeeper = ibckeeper.NewKeeper(
 		appCodec,
 		runtime.NewKVStoreService(keys[ibcexported.StoreKey]),
-		nil,
 		app.UpgradeKeeper,
 		authAddr,
 	)
@@ -444,7 +446,7 @@ func NewExampleApp(
 	// NOTE: it's required to set up the EVM keeper before the ERC-20 keeper, because it is used in its instantiation.
 	app.EVMKeeper = evmkeeper.NewKeeper(
 		// TODO: check why this is not adjusted to use the runtime module methods like SDK native keepers
-		appCodec, keys[evmtypes.StoreKey], tkeys[evmtypes.TransientKey], keys,
+		appCodec, keys[evmtypes.StoreKey], tkeys[evmtypes.TransientKey], nonTransientKeys,
 		authtypes.NewModuleAddress(govtypes.ModuleName),
 		app.AccountKeeper,
 		app.PreciseBankKeeper,
@@ -482,16 +484,15 @@ func NewExampleApp(
 	// instantiate IBC transfer keeper AFTER the ERC-20 keeper to use it in the instantiation
 	app.TransferKeeper = transferkeeper.NewKeeper(
 		appCodec,
+		evmaddress.NewEvmCodec(sdk.GetConfig().GetBech32AccountAddrPrefix()),
 		runtime.NewKVStoreService(keys[ibctransfertypes.StoreKey]),
 		app.IBCKeeper.ChannelKeeper,
-		app.IBCKeeper.ChannelKeeper,
 		app.MsgServiceRouter(),
 		app.AccountKeeper,
 		app.BankKeeper,
 		app.Erc20Keeper, // Add ERC20 Keeper for ERC20 transfers
 		authAddr,
 	)
-	app.TransferKeeper.SetAddressCodec(evmaddress.NewEvmCodec(sdk.GetConfig().GetBech32AccountAddrPrefix()))
 
 	/*
 		Create Transfer Stack
@@ -519,7 +520,10 @@ func NewExampleApp(
 		app.EVMKeeper,
 		app.Erc20Keeper,
 	)
-	transferStack = ibccallbacks.NewIBCMiddleware(transferStack, app.IBCKeeper.ChannelKeeper, app.CallbackKeeper, maxCallbackGas)
+	callbacksMiddleware := ibccallbacks.NewIBCMiddleware(app.CallbackKeeper, maxCallbackGas)
+	callbacksMiddleware.SetICS4Wrapper(app.IBCKeeper.ChannelKeeper)
+	callbacksMiddleware.SetUnderlyingApplication(transferStack)
+	transferStack = callbacksMiddleware
 
 	var transferStackV2 ibcapi.IBCModule
 	transferStackV2 = transferv2.NewIBCModule(app.TransferKeeper)

evmd/go.mod

@@ -291,6 +291,7 @@ func (suite *TransferTestSuiteV2) TestOnRecvPacket() {
 				originalCoin, suite.chainB.SenderAccount.GetAddress().String(),
 				suite.evmChainA.SenderAccount.GetAddress().String(), clienttypes.Height{},
 				timeoutTimestamp, "", types.EncodingProtobuf,
+				false,
 			)
 			_, err := suite.chainB.SendMsgs(msg)
 			suite.Require().NoError(err) // message committed
@@ -393,6 +394,7 @@ func (suite *TransferTestSuiteV2) TestOnAckPacket() {
 				originalCoin, suite.evmChainA.SenderAccount.GetAddress().String(),
 				suite.chainB.SenderAccount.GetAddress().String(), clienttypes.Height{},
 				timeoutTimestamp, "", types.EncodingProtobuf,
+				false,
 			)
 			_, err := suite.evmChainA.SendMsgs(msg)
 			suite.Require().NoError(err) // message committed
@@ -500,6 +502,7 @@ func (suite *TransferTestSuiteV2) TestOnTimeoutPacket() {
 				originalCoin, suite.evmChainA.SenderAccount.GetAddress().String(),
 				suite.chainB.SenderAccount.GetAddress().String(), clienttypes.Height{},
 				timeoutTimestamp, "", types.EncodingProtobuf,
+				false,
 			)
 			_, err := suite.evmChainA.SendMsgs(msg)
 			suite.Require().NoError(err) // message committed