From 33b8074bd7568d128a3742f7e5e47a6a81eb0cd8 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Fri, 7 Jun 2024 08:07:49 +0200 Subject: [PATCH 1/4] refactor(x/authz,x/feegrant): provide updated keeper in depinject --- x/authz/module/module.go | 5 +++-- x/feegrant/module/module.go | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/x/authz/module/module.go b/x/authz/module/module.go index 3546f70e9d8e..fe07b661c2d0 100644 --- a/x/authz/module/module.go +++ b/x/authz/module/module.go @@ -113,7 +113,7 @@ type AppModule struct { func NewAppModule(cdc codec.Codec, keeper keeper.Keeper, ak authz.AccountKeeper, bk authz.BankKeeper, registry cdctypes.InterfaceRegistry) AppModule { return AppModule{ AppModuleBasic: AppModuleBasic{cdc: cdc, ac: ak.AddressCodec()}, - keeper: keeper.SetBankKeeper(bk), // Super ugly hack to not be api breaking in v0.50 and v0.47 + keeper: keeper, accountKeeper: ak, bankKeeper: bk, registry: registry, @@ -176,7 +176,8 @@ type ModuleOutputs struct { } func ProvideModule(in ModuleInputs) ModuleOutputs { - k := keeper.NewKeeper(in.StoreService, in.Cdc, in.MsgServiceRouter, in.AccountKeeper) + k := keeper.NewKeeper(in.StoreService, in.Cdc, in.MsgServiceRouter, in.AccountKeeper). + SetBankKeeper(in.BankKeeper) // Super ugly hack to not be api breaking in v0.50 and v0.47 m := NewAppModule(in.Cdc, k, in.AccountKeeper, in.BankKeeper, in.Registry) return ModuleOutputs{AuthzKeeper: k, Module: m} } diff --git a/x/feegrant/module/module.go b/x/feegrant/module/module.go index 24805f6e667a..2665b0d10977 100644 --- a/x/feegrant/module/module.go +++ b/x/feegrant/module/module.go @@ -120,7 +120,7 @@ type AppModule struct { func NewAppModule(cdc codec.Codec, ak feegrant.AccountKeeper, bk feegrant.BankKeeper, keeper keeper.Keeper, registry cdctypes.InterfaceRegistry) AppModule { return AppModule{ AppModuleBasic: AppModuleBasic{cdc: cdc, ac: ak.AddressCodec()}, - keeper: keeper.SetBankKeeper(bk), + keeper: keeper, accountKeeper: ak, bankKeeper: bk, registry: registry, @@ -182,7 +182,8 @@ type FeegrantInputs struct { } func ProvideModule(in FeegrantInputs) (keeper.Keeper, appmodule.AppModule) { - k := keeper.NewKeeper(in.Cdc, in.StoreService, in.AccountKeeper) + k := keeper.NewKeeper(in.Cdc, in.StoreService, in.AccountKeeper). + SetBankKeeper(in.BankKeeper) // Super ugly hack to not be api breaking in v0.50 and v0.47 m := NewAppModule(in.Cdc, in.AccountKeeper, in.BankKeeper, k, in.Registry) return k, m } From 375741e24cebd48905e0aa5ae67315d6e704b99f Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Fri, 7 Jun 2024 08:11:14 +0200 Subject: [PATCH 2/4] updates --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7235d0e59f78..b86f7ba24904 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,10 @@ Ref: https://keepachangelog.com/en/1.0.0/ ## [Unreleased] +## Improvements + +* (x/authz,x/feegrant) [#20590](https://github.com/cosmos/cosmos-sdk/pull/20590) Provide updated keeper in depinject for authz and feegrant modules. + ## [v0.50.7](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.50.7) - 2024-06-04 ### Improvements From add8f1417862a2e1f97eb4fcecd64560261b0bd1 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Fri, 7 Jun 2024 08:13:15 +0200 Subject: [PATCH 3/4] fix --- x/authz/module/module.go | 7 +++---- x/feegrant/module/module.go | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/x/authz/module/module.go b/x/authz/module/module.go index fe07b661c2d0..6ff656446001 100644 --- a/x/authz/module/module.go +++ b/x/authz/module/module.go @@ -113,7 +113,7 @@ type AppModule struct { func NewAppModule(cdc codec.Codec, keeper keeper.Keeper, ak authz.AccountKeeper, bk authz.BankKeeper, registry cdctypes.InterfaceRegistry) AppModule { return AppModule{ AppModuleBasic: AppModuleBasic{cdc: cdc, ac: ak.AddressCodec()}, - keeper: keeper, + keeper: keeper.SetBankKeeper(bk), // Super ugly hack to not be api breaking in v0.50 and v0.47, accountKeeper: ak, bankKeeper: bk, registry: registry, @@ -176,10 +176,9 @@ type ModuleOutputs struct { } func ProvideModule(in ModuleInputs) ModuleOutputs { - k := keeper.NewKeeper(in.StoreService, in.Cdc, in.MsgServiceRouter, in.AccountKeeper). - SetBankKeeper(in.BankKeeper) // Super ugly hack to not be api breaking in v0.50 and v0.47 + k := keeper.NewKeeper(in.StoreService, in.Cdc, in.MsgServiceRouter, in.AccountKeeper) m := NewAppModule(in.Cdc, k, in.AccountKeeper, in.BankKeeper, in.Registry) - return ModuleOutputs{AuthzKeeper: k, Module: m} + return ModuleOutputs{AuthzKeeper: k.SetBankKeeper(in.BankKeeper) /* depinject ux improvement */, Module: m} } // ____________________________________________________________________________ diff --git a/x/feegrant/module/module.go b/x/feegrant/module/module.go index 2665b0d10977..5baebe39021a 100644 --- a/x/feegrant/module/module.go +++ b/x/feegrant/module/module.go @@ -120,7 +120,7 @@ type AppModule struct { func NewAppModule(cdc codec.Codec, ak feegrant.AccountKeeper, bk feegrant.BankKeeper, keeper keeper.Keeper, registry cdctypes.InterfaceRegistry) AppModule { return AppModule{ AppModuleBasic: AppModuleBasic{cdc: cdc, ac: ak.AddressCodec()}, - keeper: keeper, + keeper: keeper.SetBankKeeper(bk), // Super ugly hack to not be api breaking in v0.50 and v0.47 accountKeeper: ak, bankKeeper: bk, registry: registry, @@ -182,10 +182,9 @@ type FeegrantInputs struct { } func ProvideModule(in FeegrantInputs) (keeper.Keeper, appmodule.AppModule) { - k := keeper.NewKeeper(in.Cdc, in.StoreService, in.AccountKeeper). - SetBankKeeper(in.BankKeeper) // Super ugly hack to not be api breaking in v0.50 and v0.47 + k := keeper.NewKeeper(in.Cdc, in.StoreService, in.AccountKeeper) m := NewAppModule(in.Cdc, in.AccountKeeper, in.BankKeeper, k, in.Registry) - return k, m + return k.SetBankKeeper(in.BankKeeper) /* depinject ux improvement */, m } // AppModuleSimulation functions From 189b73bcbf4c4819f971be522e2dab75234ecd14 Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Fri, 7 Jun 2024 08:13:39 +0200 Subject: [PATCH 4/4] nit --- x/authz/module/module.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/authz/module/module.go b/x/authz/module/module.go index 6ff656446001..3c80d13c1420 100644 --- a/x/authz/module/module.go +++ b/x/authz/module/module.go @@ -113,7 +113,7 @@ type AppModule struct { func NewAppModule(cdc codec.Codec, keeper keeper.Keeper, ak authz.AccountKeeper, bk authz.BankKeeper, registry cdctypes.InterfaceRegistry) AppModule { return AppModule{ AppModuleBasic: AppModuleBasic{cdc: cdc, ac: ak.AddressCodec()}, - keeper: keeper.SetBankKeeper(bk), // Super ugly hack to not be api breaking in v0.50 and v0.47, + keeper: keeper.SetBankKeeper(bk), // Super ugly hack to not be api breaking in v0.50 and v0.47 accountKeeper: ak, bankKeeper: bk, registry: registry,