diff --git a/app/app.go b/app/app.go index fbde6ec6..f4fe6507 100644 --- a/app/app.go +++ b/app/app.go @@ -87,7 +87,7 @@ import ( ibcfee "github.com/cosmos/ibc-go/v5/modules/apps/29-fee" ibcfeekeeper "github.com/cosmos/ibc-go/v5/modules/apps/29-fee/keeper" ibcfeetypes "github.com/cosmos/ibc-go/v5/modules/apps/29-fee/types" - transfer "github.com/cosmos/ibc-go/v5/modules/apps/transfer" + "github.com/cosmos/ibc-go/v5/modules/apps/transfer" ibctransferkeeper "github.com/cosmos/ibc-go/v5/modules/apps/transfer/keeper" ibctransfertypes "github.com/cosmos/ibc-go/v5/modules/apps/transfer/types" ibc "github.com/cosmos/ibc-go/v5/modules/core" @@ -157,7 +157,7 @@ var ( ica.AppModuleBasic{}, intertx.AppModuleBasic{}, ibcfee.AppModuleBasic{}, - // this line is used by starport scaffolding # stargate/app/moduleBasic + // this line is used by starport scaffolding # stargate/app/moduleBasic ) // module account permissions @@ -397,6 +397,7 @@ func New( ) app.ICAHostKeeper = icahostkeeper.NewKeeper( appCodec, keys[icahosttypes.StoreKey], app.GetSubspace(icahosttypes.SubModuleName), + app.IBCFeeKeeper, app.IBCKeeper.ChannelKeeper, &app.IBCKeeper.PortKeeper, app.AccountKeeper, scopedICAHostKeeper, app.MsgServiceRouter(), ) diff --git a/go.mod b/go.mod index 9e71aa4d..a5f98fa9 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( ) require ( - github.com/cosmos/ibc-go/v5 v5.0.0-rc2 + github.com/cosmos/ibc-go/v5 v5.0.0 github.com/golang/protobuf v1.5.2 google.golang.org/genproto v0.0.0-20220725144611-272f38e5d71b ) diff --git a/go.sum b/go.sum index 8aba126f..741440da 100644 --- a/go.sum +++ b/go.sum @@ -236,8 +236,8 @@ github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4 github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= github.com/cosmos/iavl v0.19.1 h1:3gaq9b6SjiB0KBTygRnAvEGml2pQlu1TH8uma5g63Ys= github.com/cosmos/iavl v0.19.1/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= -github.com/cosmos/ibc-go/v5 v5.0.0-rc2 h1:7rGkZwojUwK1Dvgze3ZP5K1upIKygudxU3WaeFFU2ts= -github.com/cosmos/ibc-go/v5 v5.0.0-rc2/go.mod h1:Wqsguq98Iuns8tgTv8+xaGYbC+Q8zJfbpjzT6IgMJbs= +github.com/cosmos/ibc-go/v5 v5.0.0 h1:MkObdarpoICPHXoRg/Ne9NRix4j7eQlJZq74/uzH3Zc= +github.com/cosmos/ibc-go/v5 v5.0.0/go.mod h1:Wqsguq98Iuns8tgTv8+xaGYbC+Q8zJfbpjzT6IgMJbs= github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4= github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY= github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI= diff --git a/x/inter-tx/keeper/keeper_test.go b/x/inter-tx/keeper/keeper_test.go index 4caadf27..f3131a09 100644 --- a/x/inter-tx/keeper/keeper_test.go +++ b/x/inter-tx/keeper/keeper_test.go @@ -5,11 +5,9 @@ import ( "testing" "github.com/stretchr/testify/suite" - "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/libs/log" dbm "github.com/tendermint/tm-db" - sdk "github.com/cosmos/cosmos-sdk/types" icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types" channeltypes "github.com/cosmos/ibc-go/v5/modules/core/04-channel/types" ibctesting "github.com/cosmos/ibc-go/v5/testing" @@ -18,12 +16,6 @@ import ( ) var ( - // TODO: Cosmos-SDK ADR-28: Update crypto.AddressHash() when sdk uses address.Module() - // https://github.com/cosmos/cosmos-sdk/issues/10225 - // - // TestAccAddress defines a reusable bech32 address for testing purposes - TestAccAddress = icatypes.GenerateAddress(sdk.AccAddress(crypto.AddressHash([]byte(icatypes.ModuleName))), ibctesting.FirstConnectionID, TestPortID) - // TestOwnerAddress defines a reusable bech32 address for testing purposes TestOwnerAddress = "cosmos17dtl0mjt3t77kpuhg2edqzjpszulwhgzuj9ljs"