fix custom staking keeper msg server issue with nil keeper

ComposableFi · Dec 16, 2023 · dc2842b · dc2842b
1 parent 229a985
commit dc2842b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
@@ -185,15 +185,15 @@ func (appKeepers *AppKeepers) InitNormalKeepers(
 		appCodec, appKeepers.keys[stakingtypes.StoreKey], appKeepers.AccountKeeper, appKeepers.BankKeeper, authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 
-	appKeepers.CustomStakingKeeper = customstaking.NewBaseKeeper(
-		appCodec /*appKeepers.keys[customstakingtypes.StoreKey],*/, *appKeepers.StakingKeeper, appKeepers.AccountKeeper, appKeepers.MintKeeper, authtypes.NewModuleAddress(govtypes.ModuleName).String(),
-	)
-
 	appKeepers.MintKeeper = mintkeeper.NewKeeper(
 		appCodec, appKeepers.keys[minttypes.StoreKey], appKeepers.StakingKeeper,
 		appKeepers.AccountKeeper, appKeepers.BankKeeper, authtypes.FeeCollectorName, authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 
+	appKeepers.CustomStakingKeeper = customstaking.NewKeeper(
+		appCodec /*appKeepers.keys[stakingtypes.StoreKey],*/, *appKeepers.StakingKeeper, appKeepers.AccountKeeper, &appKeepers.MintKeeper, authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+	)
+
 	appKeepers.DistrKeeper = distrkeeper.NewKeeper(
 		appCodec, appKeepers.keys[distrtypes.StoreKey], appKeepers.AccountKeeper, appKeepers.BankKeeper,
 		appKeepers.StakingKeeper, authtypes.FeeCollectorName, authtypes.NewModuleAddress(govtypes.ModuleName).String(),

diff --git a/custom/staking/keeper/keeper.go b/custom/staking/keeper/keeper.go
@@ -2,7 +2,6 @@ package keeper
 
 import (
 	"github.com/cosmos/cosmos-sdk/codec"
-	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	accountkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 
@@ -12,9 +11,8 @@ import (
 type Keeper struct {
 	stakingkeeper.Keeper
 	cdc        codec.BinaryCodec
-	storeKey   storetypes.StoreKey
 	acck       accountkeeper.AccountKeeper
-	mintkeeper mintkeeper.Keeper
+	mintkeeper *mintkeeper.Keeper
 	authority  string
 }
 
@@ -33,19 +31,19 @@ type Keeper struct {
 // 	return keeper
 // }
 
-func NewBaseKeeper(
+func NewKeeper(
 	cdc codec.BinaryCodec,
-	// keys storetypes.StoreKey,
 	staking stakingkeeper.Keeper,
 	acck accountkeeper.AccountKeeper,
-	mintkeeper mintkeeper.Keeper,
+	mintkeeper *mintkeeper.Keeper,
 	authority string,
 ) Keeper {
 	keeper := Keeper{
 		Keeper:     staking,
 		acck:       acck,
 		authority:  authority,
 		mintkeeper: mintkeeper,
+		cdc:        cdc,
 	}
 	return keeper
 }

diff --git a/custom/staking/keeper/msg_server.go b/custom/staking/keeper/msg_server.go
@@ -16,8 +16,8 @@ type msgServer struct {
 
 var _ types.MsgServer = msgServer{}
 
-func NewMsgServerImpl(stakingKeeper stakingkeeper.Keeper) types.MsgServer {
-	return &msgServer{msgServer: stakingkeeper.NewMsgServerImpl(&stakingKeeper)}
+func NewMsgServerImpl(stakingKeeper stakingkeeper.Keeper, customstakingkeeper Keeper) types.MsgServer {
+	return &msgServer{Keeper: customstakingkeeper, msgServer: stakingkeeper.NewMsgServerImpl(&stakingKeeper)}
 }
 
 func (k msgServer) CreateValidator(goCtx context.Context, msg *types.MsgCreateValidator) (*types.MsgCreateValidatorResponse, error) {

diff --git a/custom/staking/module.go b/custom/staking/module.go
@@ -37,7 +37,7 @@ func NewAppModule(cdc codec.Codec, keeper customstakingkeeper.Keeper, accountKee
 // when trying to force this custom keeper into a bankkeeper.BaseKeeper
 func (am AppModule) RegisterServices(cfg module.Configurator) {
 	// types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(&am.keeper))
-	types.RegisterMsgServer(cfg.MsgServer(), customstakingkeeper.NewMsgServerImpl(am.keeper.Keeper))
+	types.RegisterMsgServer(cfg.MsgServer(), customstakingkeeper.NewMsgServerImpl(am.keeper.Keeper, am.keeper))
 	querier := keeper.Querier{Keeper: &am.keeper.Keeper}
 	types.RegisterQueryServer(cfg.QueryServer(), querier)
 

diff --git a/x/mint/keeper/keeper.go b/x/mint/keeper/keeper.go
@@ -168,7 +168,7 @@ func (k Keeper) StoreDelegation(ctx sdk.Context, delegation stakingtypes.Delegat
 
 // SetLastTotalPower Set the last total validator power.
 func (k Keeper) SetLastTotalPower(ctx sdk.Context, power math.Int) {
-	// store := ctx.KVStore(k.storeKey)
-	// bz := k.cdc.MustMarshal(&sdk.IntProto{Int: power})
-	// store.Set(types.DelegationKey, bz)
+	store := ctx.KVStore(k.storeKey)
+	bz := k.cdc.MustMarshal(&sdk.IntProto{Int: power})
+	store.Set(types.DelegationKey, bz)
 }