Skip to content

Commit

Permalink
chore: push ica depinject changes and todos
Browse files Browse the repository at this point in the history
  • Loading branch information
@damiannolan
damiannolan committed Apr 30, 2024
1 parent 54bc954 commit f8614c6
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 24 deletions.
13 changes: 8 additions & 5 deletions modules/apps/27-interchain-accounts/depinject.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,22 @@ type ModuleInputs struct {
depinject.In

// TODO: Config should define `controller_enabled` and `host_enabled` vars for keeper/module setup
Config *modulev1.Module
Cdc codec.Codec
Config *modulev1.Module
Cdc codec.Codec

// TODO: runtime seems to expect that a module contains a single kvstore key.
ControllerKey *storetypes.KVStoreKey
HostKey *storetypes.KVStoreKey

Ics4Wrapper porttypes.ICS4Wrapper
ChannelKeeper types.ChannelKeeper
PortKeeper types.PortKeeper
CapabilityKeeper capabilitykeeper.Keeper
CapabilityKeeper *capabilitykeeper.Keeper
AccountKeeper types.AccountKeeper

MsgRouter types.MessageRouter
QueryRouter types.QueryRouter
MsgRouter types.MessageRouter
// TODO(remove optional): GRCPQueryRouter is not outputted into DI container on v0.50. It is on main.
QueryRouter types.QueryRouter `optional:"true"`

// LegacySubspace is used solely for migration of x/params managed parameters
LegacySubspace paramtypes.Subspace `optional:"true"`
Expand Down
47 changes: 28 additions & 19 deletions testing/simapp/app_config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,26 @@ import (

"google.golang.org/protobuf/types/known/durationpb"

_ "cosmossdk.io/x/circuit" // import for side-effects
_ "cosmossdk.io/x/evidence" // import for side-effects
_ "cosmossdk.io/x/feegrant/module" // import for side-effects
_ "cosmossdk.io/x/upgrade" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/auth/tx/config" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/auth/vesting" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/authz/module" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/bank" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/consensus" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/crisis" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/distribution" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/group/module" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/mint" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/params" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/slashing" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/staking" // import for side-effects
_ "github.com/cosmos/ibc-go/modules/capability" // import for side-effects
_ "github.com/cosmos/ibc-go/v8/modules/apps/transfer" // import for side-effects
_ "github.com/cosmos/ibc-go/v8/modules/core" // import for side-effects
_ "cosmossdk.io/x/circuit" // import for side-effects
_ "cosmossdk.io/x/evidence" // import for side-effects
_ "cosmossdk.io/x/feegrant/module" // import for side-effects
_ "cosmossdk.io/x/upgrade" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/auth/tx/config" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/auth/vesting" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/authz/module" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/bank" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/consensus" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/crisis" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/distribution" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/group/module" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/mint" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/params" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/slashing" // import for side-effects
_ "github.com/cosmos/cosmos-sdk/x/staking" // import for side-effects
_ "github.com/cosmos/ibc-go/modules/capability" // import for side-effects
_ "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts" // import for side-effects
_ "github.com/cosmos/ibc-go/v8/modules/apps/transfer" // import for side-effects
_ "github.com/cosmos/ibc-go/v8/modules/core" // import for side-effects

runtimev1alpha1 "cosmossdk.io/api/cosmos/app/runtime/v1alpha1"
appv1alpha1 "cosmossdk.io/api/cosmos/app/v1alpha1"
Expand Down Expand Up @@ -75,12 +76,14 @@ import (
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

capabilitymodulev1 "github.com/cosmos/ibc-go/api/capability/module/v1"
icamodulev1 "github.com/cosmos/ibc-go/api/ibc/applications/interchain_accounts/module/v1"
ibctransfermodulev1 "github.com/cosmos/ibc-go/api/ibc/applications/transfer/module/v1"
ibcmodulev1 "github.com/cosmos/ibc-go/api/ibc/core/module/v1"
solomachinemodulev1 "github.com/cosmos/ibc-go/api/ibc/lightclients/solomachine/module/v1"
ibctmmodulev1 "github.com/cosmos/ibc-go/api/ibc/lightclients/tendermint/module/v1"
ibcmockmodulev1 "github.com/cosmos/ibc-go/api/mock/module/v1"
capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
icatypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/types"
ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types"
ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
solomachine "github.com/cosmos/ibc-go/v8/modules/light-clients/06-solomachine"
Expand All @@ -98,6 +101,7 @@ var (
{Account: stakingtypes.NotBondedPoolName, Permissions: []string{authtypes.Burner, stakingtypes.ModuleName}},
{Account: govtypes.ModuleName, Permissions: []string{authtypes.Burner}},
{Account: ibctransfertypes.ModuleName, Permissions: []string{authtypes.Minter, authtypes.Burner}},
{Account: icatypes.ModuleName},
}

// blocked account addresses
Expand Down Expand Up @@ -176,6 +180,7 @@ var (
ibcexported.ModuleName,
ibcmock.ModuleName,
ibctransfertypes.ModuleName,
icatypes.ModuleName,
},
// When ExportGenesis is not specified, the export genesis module order
// is equal to the init genesis order
Expand Down Expand Up @@ -300,6 +305,10 @@ var (
Name: ibctransfertypes.ModuleName,
Config: appconfig.WrapAny(&ibctransfermodulev1.Module{}),
},
{
Name: icatypes.ModuleName,
Config: appconfig.WrapAny(&icamodulev1.Module{}),
},
},
}),
depinject.Supply(
Expand Down

0 comments on commit f8614c6

Please sign in to comment.