Merge pull request #285 from ComposableFi/reimplement-delegate-msg-se…

…rver-func

Reimplement delegate msg server func

app/keepers/keepers.go

@@ -100,6 +100,8 @@ import (
 	ibc_hooks "github.com/notional-labs/composable/v6/x/ibc-hooks"
 	ibchookskeeper "github.com/notional-labs/composable/v6/x/ibc-hooks/keeper"
 	ibchookstypes "github.com/notional-labs/composable/v6/x/ibc-hooks/types"
+
+	customstakingtypes "github.com/notional-labs/composable/v6/custom/staking/types"
 )
 
 const (
@@ -186,7 +188,7 @@ func (appKeepers *AppKeepers) InitNormalKeepers(
 	)
 
 	appKeepers.CustomStakingKeeper = customstaking.NewBaseKeeper2(
-		*appKeepers.StakingKeeper, appKeepers.AccountKeeper,
+		appCodec, appKeepers.keys[customstakingtypes.StoreKey], *appKeepers.StakingKeeper, appKeepers.AccountKeeper, authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 
 	appKeepers.MintKeeper = mintkeeper.NewKeeper(

app/keepers/keys.go

@@ -41,6 +41,8 @@ import (
 
 	"github.com/CosmWasm/wasmd/x/wasm"
 	wasm08types "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types"
+
+	customstakingtypes "github.com/notional-labs/composable/v6/custom/staking/types"
 )
 
 // GenerateKeys generates new keys (KV Store, Transient store, and memory store).
@@ -52,7 +54,7 @@ func (appKeepers *AppKeepers) GenerateKeys() {
 		govtypes.StoreKey, paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey,
 		evidencetypes.StoreKey, ibctransfertypes.StoreKey, icqtypes.StoreKey, capabilitytypes.StoreKey, consensusparamtypes.StoreKey, wasm08types.StoreKey,
 		crisistypes.StoreKey, routertypes.StoreKey, transfermiddlewaretypes.StoreKey, group.StoreKey, minttypes.StoreKey, wasm.StoreKey, ibchookstypes.StoreKey, icahosttypes.StoreKey, ratelimitmoduletypes.StoreKey, txBoundaryTypes.StoreKey,
-		authzkeeper.StoreKey,
+		authzkeeper.StoreKey, customstakingtypes.StoreKey,
 	)
 
 	// Define transient store keys

custom/staking/keeper/keeper.go

@@ -3,45 +3,62 @@ package keeper
 import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	accountkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
-	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
-	"github.com/cosmos/cosmos-sdk/x/bank/types"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
+	"github.com/cosmos/cosmos-sdk/x/staking/types"
+
+	customstakingtypes "github.com/notional-labs/composable/v6/custom/staking/types"
 )
 
 type Keeper struct {
 	stakingkeeper.Keeper
-	acck accountkeeper.AccountKeeper
+	cdc       codec.BinaryCodec
+	storeKey  storetypes.StoreKey
+	acck      accountkeeper.AccountKeeper
+	authority string
 }
 
 var _ stakingkeeper.Keeper = stakingkeeper.Keeper{} //???
 
-func NewBaseKeeper(
-	cdc codec.BinaryCodec,
-	key storetypes.StoreKey,
-	ak types.AccountKeeper,
-	acck accountkeeper.AccountKeeper,
-	bk bankkeeper.Keeper,
-	authority string,
-) Keeper {
-	keeper := Keeper{
-		Keeper: *stakingkeeper.NewKeeper(cdc, key, ak, bk, authority),
-		acck:   acck,
-	}
-	return keeper
-}
+// func NewBaseKeeper(
+// 	cdc codec.BinaryCodec,
+// 	key storetypes.StoreKey,
+// 	ak types.AccountKeeper,
+// 	acck accountkeeper.AccountKeeper,
+// 	bk bankkeeper.Keeper,
+// 	authority string,
+// ) Keeper {
+// 	keeper := Keeper{
+// 		Keeper: *stakingkeeper.NewKeeper(cdc, key, ak, bk, authority),
+// 		acck:   acck,
+// 	}
+// 	return keeper
+// }
 
 func NewBaseKeeper2(
+	cdc codec.BinaryCodec,
+	keys storetypes.StoreKey,
 	staking stakingkeeper.Keeper,
 	acck accountkeeper.AccountKeeper,
+	authority string,
 ) Keeper {
 	keeper := Keeper{
-		Keeper: staking,
-		acck:   acck,
+		Keeper:    staking,
+		acck:      acck,
+		authority: authority,
 	}
 	return keeper
 }
 
 // func (k *Keeper) RegisterKeepers(akk banktypes.StakingKeeper) {
 // 	k.acck = sk
 // }
+
+func (k Keeper) StoreDelegation(ctx sdk.Context, delegation types.Delegation) {
+	delegatorAddress := sdk.MustAccAddressFromBech32(delegation.DelegatorAddress)
+
+	store := ctx.KVStore(k.storeKey)
+	b := types.MustMarshalDelegation(k.cdc, delegation)
+	store.Set(customstakingtypes.GetDelegationKey(delegatorAddress, delegation.GetValidatorAddr()), b)
+}

custom/staking/keeper/msg_server.go

@@ -3,6 +3,8 @@ package keeper
 import (
 	"context"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	"github.com/cosmos/cosmos-sdk/x/staking/types"
 )
@@ -27,7 +29,26 @@ func (k msgServer) EditValidator(goCtx context.Context, msg *types.MsgEditValida
 }
 
 func (k msgServer) Delegate(goCtx context.Context, msg *types.MsgDelegate) (*types.MsgDelegateResponse, error) {
-	return k.msgServer.Delegate(goCtx, msg)
+
+	ctx := sdk.UnwrapSDKContext(goCtx)
+
+	bondDenom := k.BondDenom(ctx)
+	if msg.Amount.Denom != bondDenom {
+		return nil, sdkerrors.Wrapf(
+			sdkerrors.ErrInvalidRequest, "invalid coin denomination: got %s, expected %s", msg.Amount.Denom, bondDenom,
+		)
+	}
+
+	delegation := types.Delegation{
+		DelegatorAddress: msg.DelegatorAddress,
+		ValidatorAddress: msg.ValidatorAddress,
+		Shares:           msg.Amount.Amount.ToLegacyDec(),
+	}
+	k.StoreDelegation(ctx, delegation)
+
+	return &types.MsgDelegateResponse{}, nil
+	// return nil, fmt.Errorf("My custom error: Nikita")
+	// return k.msgServer.Delegate(goCtx, msg)
 }
 
 func (k msgServer) BeginRedelegate(goCtx context.Context, msg *types.MsgBeginRedelegate) (*types.MsgBeginRedelegateResponse, error) {

custom/staking/types/keys.go

@@ -0,0 +1,39 @@
+package types
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/address"
+)
+
+// MinterKey is the key to use for the keeper store.
+var (
+	DelegationKey = []byte{0x37} // key for a delegation
+)
+
+const (
+	// module name
+	ModuleName = "customstaking"
+
+	// StoreKey is the default store key for mint
+	StoreKey = ModuleName
+
+	// QuerierRoute is the querier route for the minting store.
+	QuerierRoute = StoreKey
+
+	// // Query endpoints supported by the minting querier
+	// QueryParameters       = "parameters"
+	// QueryInflation        = "inflation"
+	// QueryAnnualProvisions = "annual_provisions"
+)
+
+var ()
+
+// GetDelegationKey creates the key for delegator bond with validator
+// VALUE: staking/Delegation
+func GetDelegationKey(delAddr sdk.AccAddress, valAddr sdk.ValAddress) []byte {
+	return append(GetDelegationsKey(delAddr), address.MustLengthPrefix(valAddr)...)
+}
+
+func GetDelegationsKey(delAddr sdk.AccAddress) []byte {
+	return append(DelegationKey, address.MustLengthPrefix(delAddr)...)
+}