feat: add amount arg to leveragelp close cli and wasm bindings (#470)

* feat: add amount arg to leveragelp close cli and wasm bindings

* fix: fix sender addr

x/leveragelp/client/cli/tx_close.go

@@ -7,16 +7,17 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/elys-network/elys/x/leveragelp/types"
 	"github.com/spf13/cobra"
 )
 
 func CmdClose() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:     "close [position-id] [flags]",
+		Use:     "close [position-id] [amount] [flags]",
 		Short:   "Close leveragelp position",
-		Example: `elysd tx leveragelp close 1 --from=treasury --keyring-backend=test --chain-id=elystestnet-1 --yes --gas=1000000`,
-		Args:    cobra.ExactArgs(1),
+		Example: `elysd tx leveragelp close 1 10000000 --from=treasury --keyring-backend=test --chain-id=elystestnet-1 --yes --gas=1000000`,
+		Args:    cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 			clientCtx, err := client.GetClientTxContext(cmd)
 			if err != nil {
@@ -27,14 +28,20 @@ func CmdClose() *cobra.Command {
 				return errors.New("signer address is missing")
 			}
 
-			argPositionId, ok := strconv.ParseUint(args[0], 10, 64)
-			if ok != nil {
+			argPositionId, err := strconv.ParseUint(args[0], 10, 64)
+			if err != nil {
 				return errors.New("invalid position id")
 			}
 
+			argAmount, ok := sdk.NewIntFromString(args[1])
+			if !ok {
+				return errors.New("invalid amount")
+			}
+
 			msg := types.NewMsgClose(
 				signer.String(),
 				argPositionId,
+				argAmount,
 			)
 			if err := msg.ValidateBasic(); err != nil {
 				return err

x/leveragelp/client/wasm/msg_close.go

@@ -20,9 +20,15 @@ func (m *Messenger) msgClose(ctx sdk.Context, contractAddr sdk.AccAddress, msgCl
 		return nil, nil, wasmvmtypes.InvalidRequest{Err: "close wrong sender"}
 	}
 
-	res, err := PerformMsgClose(m.keeper, ctx, contractAddr, msgClose)
+	if err := msgClose.ValidateBasic(); err != nil {
+		return nil, nil, errorsmod.Wrap(err, "failed validating msgMsgClose")
+	}
+
+	msgServer := leveragelpkeeper.NewMsgServerImpl(*m.keeper)
+
+	res, err := msgServer.Close(sdk.WrapSDKContext(ctx), msgClose)
 	if err != nil {
-		return nil, nil, errorsmod.Wrap(err, "perform close")
+		return nil, nil, errorsmod.Wrap(err, "leveragelp close msg")
 	}
 
 	responseBytes, err := json.Marshal(*res)
@@ -34,24 +40,3 @@ func (m *Messenger) msgClose(ctx sdk.Context, contractAddr sdk.AccAddress, msgCl
 
 	return nil, resp, nil
 }
-
-func PerformMsgClose(f *leveragelpkeeper.Keeper, ctx sdk.Context, contractAddr sdk.AccAddress, msgClose *leveragelptypes.MsgClose) (*leveragelptypes.MsgCloseResponse, error) {
-	if msgClose == nil {
-		return nil, wasmvmtypes.InvalidRequest{Err: "leveragelp close null leveragelp close"}
-	}
-	msgServer := leveragelpkeeper.NewMsgServerImpl(*f)
-
-	msgMsgClose := leveragelptypes.NewMsgClose(msgClose.Creator, uint64(msgClose.Id))
-
-	if err := msgMsgClose.ValidateBasic(); err != nil {
-		return nil, errorsmod.Wrap(err, "failed validating msgMsgClose")
-	}
-
-	_, err := msgServer.Close(sdk.WrapSDKContext(ctx), msgMsgClose) // Discard the response because it's empty
-	if err != nil {
-		return nil, errorsmod.Wrap(err, "leveragelp close msg")
-	}
-
-	resp := &leveragelptypes.MsgCloseResponse{}
-	return resp, nil
-}

x/leveragelp/types/msgs.go

@@ -25,10 +25,11 @@ var (
 	_ sdk.Msg = &MsgDewhitelist{}
 )
 
-func NewMsgClose(creator string, id uint64) *MsgClose {
+func NewMsgClose(creator string, id uint64, amount math.Int) *MsgClose {
 	return &MsgClose{
-		Creator: creator,
-		Id:      id,
+		Creator:  creator,
+		Id:       id,
+		LpAmount: amount,
 	}
 }
 

x/perpetual/client/wasm/msg_close.go

@@ -24,12 +24,12 @@ func (m *Messenger) msgClose(ctx sdk.Context, contractAddr sdk.AccAddress, msgCl
 		return nil, nil, wasmvmtypes.InvalidRequest{Err: "close wrong sender"}
 	}
 
-	msgServer := perpetualkeeper.NewMsgServerImpl(*m.keeper)
-
 	if err := msgClose.ValidateBasic(); err != nil {
 		return nil, nil, errorsmod.Wrap(err, "failed validating msgMsgClose")
 	}
 
+	msgServer := perpetualkeeper.NewMsgServerImpl(*m.keeper)
+
 	res, err := msgServer.BrokerClose(sdk.WrapSDKContext(ctx), msgClose)
 	if err != nil {
 		return nil, nil, errorsmod.Wrap(err, "perpetual close msg")