add recipient on SwapByDenom

elys-network · Nov 27, 2023 · ee10806 · ee10806
1 parent 7ed25d5
commit ee10806
Show file tree

Hide file tree

Showing 5 changed files with 138 additions and 82 deletions.
diff --git a/proto/elys/amm/tx.proto b/proto/elys/amm/tx.proto
@@ -112,6 +112,7 @@ message MsgSwapByDenom {
   string                   denom_in   = 5;
   string                   denom_out  = 6;
   string                   discount   = 7 [(gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false];
+  string                   recipient = 8;
 }
 
 message MsgSwapByDenomResponse {

diff --git a/x/amm/client/cli/tx_swap_by_denom.go b/x/amm/client/cli/tx_swap_by_denom.go
@@ -20,17 +20,18 @@ const (
 
 func CmdSwapByDenom() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:     "swap-by-denom [amount] [denom-in] [denom-out]",
+		Use:     "swap-by-denom [amount] [denom-in] [denom-out] [recipient]",
 		Short:   "Swap an exact amount of tokens for a minimum of another token or a maximum amount of tokens for an exact amount on another token, similar to swapping a token on the trade screen GUI.",
 		Example: "elysd tx amm swap-by-denom 1000000000uatom uatom uusd --min-amount=1000000000uatom --max-amount=1000000000uatom --discount=0.1 --from jack --keyring-backend test",
-		Args:    cobra.ExactArgs(3),
+		Args:    cobra.ExactArgs(4),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 			argAmount, err := sdk.ParseCoinNormalized(args[0])
 			if err != nil {
 				return err
 			}
 			argDenomIn := args[1]
 			argDenomOut := args[2]
+			argRecipient := args[3]
 
 			minAmountStr, err := cmd.Flags().GetString(FlagMinAmount)
 			if err != nil {
@@ -72,6 +73,7 @@ func CmdSwapByDenom() *cobra.Command {
 
 			msg := types.NewMsgSwapByDenom(
 				clientCtx.GetFromAddress().String(),
+				argRecipient,
 				argAmount,
 				minAmount,
 				maxAmount,

diff --git a/x/amm/keeper/msg_server_swap_by_denom.go b/x/amm/keeper/msg_server_swap_by_denom.go
@@ -43,9 +43,10 @@ func (k msgServer) SwapByDenom(goCtx context.Context, msg *types.MsgSwapByDenom)
 		}
 
 		res, err := k.SwapExactAmountIn(
-			ctx,
+			sdk.WrapSDKContext(ctx),
 			&types.MsgSwapExactAmountIn{
 				Sender:            msg.Sender,
+				Recipient:         msg.Recipient,
 				Routes:            route,
 				TokenIn:           msg.Amount,
 				TokenOutMinAmount: msg.MinAmount.Amount,
@@ -79,7 +80,7 @@ func (k msgServer) SwapByDenom(goCtx context.Context, msg *types.MsgSwapByDenom)
 		}
 
 		res, err := k.SwapExactAmountOut(
-			ctx,
+			sdk.WrapSDKContext(ctx),
 			&types.MsgSwapExactAmountOut{
 				Sender:           msg.Sender,
 				Routes:           route,

diff --git a/x/amm/types/message_swap_by_denom.go b/x/amm/types/message_swap_by_denom.go
@@ -9,9 +9,10 @@ const TypeMsgSwapByDenom = "swap_by_denom"
 
 var _ sdk.Msg = &MsgSwapByDenom{}
 
-func NewMsgSwapByDenom(sender string, amount sdk.Coin, minAmount sdk.Coin, maxAmount sdk.Coin, denomIn string, denomOut string, discount sdk.Dec) *MsgSwapByDenom {
+func NewMsgSwapByDenom(sender, recipient string, amount sdk.Coin, minAmount sdk.Coin, maxAmount sdk.Coin, denomIn string, denomOut string, discount sdk.Dec) *MsgSwapByDenom {
 	return &MsgSwapByDenom{
 		Sender:    sender,
+		Recipient: recipient,
 		Amount:    amount,
 		MinAmount: minAmount,
 		MaxAmount: maxAmount,