Skip to content

Commit

Permalink
bump sdk and fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
julienrbrt committed Jan 27, 2025
1 parent 7aab2de commit a21934c
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
3 changes: 3 additions & 0 deletions ignite/templates/app/files/app/app_config.go.plush
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ var (
{Account: stakingtypes.NotBondedPoolName, Permissions: []string{authtypes.Burner, stakingtypes.ModuleName}},
{Account: govtypes.ModuleName, Permissions: []string{authtypes.Burner}},
{Account: nft.ModuleName},
{Account: ibctransfertypes.ModuleName, Permissions: []string{authtypes.Minter, authtypes.Burner}},
{Account: ibcfeetypes.ModuleName},
{Account: icatypes.ModuleName},
// this line is used by starport scaffolding # stargate/app/maccPerms
}

Expand Down
15 changes: 8 additions & 7 deletions ignite/templates/app/files/app/ibc.go.plush
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"cosmossdk.io/log"
storetypes "cosmossdk.io/store/types"
govtypes "cosmossdk.io/x/gov/types"
"github.com/cosmos/cosmos-sdk/codec"
cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
"github.com/cosmos/cosmos-sdk/runtime"
servertypes "github.com/cosmos/cosmos-sdk/server/types"
Expand Down Expand Up @@ -159,14 +160,14 @@ func (app *App) registerIBCModules(appOpts servertypes.AppOptions) error {
// RegisterIBC Since the IBC modules don't support dependency injection,
// we need to manually register the modules on the client side.
// This needs to be removed after IBC supports App Wiring.
func RegisterIBC(registry cdctypes.InterfaceRegistry) map[string]appmodule.AppModule {
func RegisterIBC(codec codec.Codec, registry cdctypes.InterfaceRegistry) map[string]appmodule.AppModule {
modules := map[string]appmodule.AppModule{
ibcexported.ModuleName: ibc.AppModule{},
ibctransfertypes.ModuleName: ibctransfer.AppModule{},
ibcfeetypes.ModuleName: ibcfee.AppModule{},
icatypes.ModuleName: icamodule.AppModule{},
ibctm.ModuleName: ibctm.AppModule{},
solomachine.ModuleName: solomachine.AppModule{},
ibcexported.ModuleName: ibc.NewAppModule(cdc, &ibckeeper.Keeper{}),
ibctransfertypes.ModuleName: ibctransfer.NewAppModule(cdc, ibctransferkeeper.Keeper{}),
ibcfeetypes.ModuleName: ibcfee.NewAppModule(cdc, ibcfeekeeper.Keeper{}),
icatypes.ModuleName: icamodule.NewAppModule(cdc, &icacontrollerkeeper.Keeper{}, &icahostkeeper.Keeper{}),
ibctm.ModuleName: ibctm.NewAppModule(ibctm.NewLightClientModule(cdc, ibcclienttypes.StoreProvider{})),
solomachine.ModuleName: solomachine.NewAppModule(solomachine.NewLightClientModule(cdc, ibcclienttypes.StoreProvider{})),
}

for _, m := range modules {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
// NewRootCmd creates a new root command for <%= BinaryNamePrefix %>d. It is called once in the main function.
func NewRootCmd() *cobra.Command {
var (
cdc codec.Codec
autoCliOpts autocli.AppOptions
moduleManager *module.Manager
clientCtx client.Context
Expand All @@ -40,6 +41,7 @@ func NewRootCmd() *cobra.Command {
ProvideClientContext,
),
),
&cdc,
&autoCliOpts,
&moduleManager,
&clientCtx,
Expand Down Expand Up @@ -82,7 +84,7 @@ func NewRootCmd() *cobra.Command {
// Since the IBC modules don't support dependency injection, we need to
// manually register the modules on the client side.
// This needs to be removed after IBC supports App Wiring.
ibcModules := app.RegisterIBC(clientCtx.InterfaceRegistry)
ibcModules := app.RegisterIBC(cdc, clientCtx.InterfaceRegistry)
for name, mod := range ibcModules {
moduleManager.Modules[name] = mod
autoCliOpts.Modules[name] = mod
Expand Down
2 changes: 1 addition & 1 deletion ignite/templates/app/files/go.mod.plush
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.23.4

// 0.52 integration
replace (
github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.52.0-rc.2
github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.52.0-rc.2.0.20250127135924-c9d68e4322bb
github.com/cosmos/ibc-go/v9 => github.com/cosmos/ibc-go/v9 v9.0.0-20250124215514-f0469954dfc7 // https://github.com/cosmos/ibc-go/pull/7882
)

Expand Down

0 comments on commit a21934c

Please sign in to comment.