added fill orders message

bze-alphateam · Jan 31, 2025 · 3d09912 · 3d09912
1 parent 8905e1d
commit 3d09912
Show file tree

Hide file tree

Showing 16 changed files with 1,303 additions and 328 deletions.
diff --git a/proto/tradebin/tx.proto b/proto/tradebin/tx.proto
@@ -10,6 +10,7 @@ service Msg {
       rpc CreateMarket(MsgCreateMarket) returns (MsgCreateMarketResponse);
   rpc CreateOrder(MsgCreateOrder) returns (MsgCreateOrderResponse);
   rpc CancelOrder(MsgCancelOrder) returns (MsgCancelOrderResponse);
+  rpc FillOrders(MsgFillOrders) returns (MsgFillOrdersResponse);
 // this line is used by starport scaffolding # proto/tx/rpc
 }
 
@@ -43,4 +44,18 @@ message MsgCancelOrder {
 message MsgCancelOrderResponse {
 }
 
+message FillOrderItem {
+  string price = 1;
+  string amount = 2;
+}
+
+message MsgFillOrders {
+  string creator = 1;
+  string marketId = 2;
+  string order_type = 3;
+  repeated FillOrderItem orders = 4;
+}
+
+message MsgFillOrdersResponse {}
+
 // this line is used by starport scaffolding # proto/tx/message
diff --git a/x/tradebin/client/cli/tx.go b/x/tradebin/client/cli/tx.go
@@ -1,7 +1,11 @@
 package cli
 
 import (
+	"encoding/json"
 	"fmt"
+	"github.com/cosmos/cosmos-sdk/client/flags"
+	"github.com/cosmos/cosmos-sdk/client/tx"
+	"strconv"
 	"time"
 
 	"github.com/spf13/cobra"
@@ -13,6 +17,7 @@ import (
 
 var (
 	DefaultRelativePacketTimeoutTimestamp = uint64((time.Duration(10) * time.Minute).Nanoseconds())
+	_                                     = strconv.Itoa(0)
 )
 
 const (
@@ -37,3 +42,142 @@ func GetTxCmd() *cobra.Command {
 
 	return cmd
 }
+
+func CmdCancelOrder() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "cancel-order [market-id] [order-id] [order-type]",
+		Short: "Broadcast message CancelOrder",
+		Args:  cobra.ExactArgs(3),
+		RunE: func(cmd *cobra.Command, args []string) (err error) {
+			argMarketId := args[0]
+			argOrderId := args[1]
+			argOrderType := args[2]
+
+			clientCtx, err := client.GetClientTxContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			msg := types.NewMsgCancelOrder(
+				clientCtx.GetFromAddress().String(),
+				argMarketId,
+				argOrderId,
+				argOrderType,
+			)
+			if err := msg.ValidateBasic(); err != nil {
+				return err
+			}
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
+		},
+	}
+
+	flags.AddTxFlagsToCmd(cmd)
+
+	return cmd
+}
+
+func CmdCreateMarket() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "create-market [base] [quote]",
+		Short: "Broadcast message CreateMarket",
+		Args:  cobra.ExactArgs(2),
+		RunE: func(cmd *cobra.Command, args []string) (err error) {
+			argAsset1 := args[0]
+			argAsset2 := args[1]
+
+			clientCtx, err := client.GetClientTxContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			msg := types.NewMsgCreateMarket(
+				clientCtx.GetFromAddress().String(),
+				argAsset1,
+				argAsset2,
+			)
+			if err := msg.ValidateBasic(); err != nil {
+				return err
+			}
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
+		},
+	}
+
+	flags.AddTxFlagsToCmd(cmd)
+
+	return cmd
+}
+
+func CmdCreateOrder() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "create-order [order-type] [amount] [price] [market-id]",
+		Short: "Broadcast message CreateOrder",
+		Args:  cobra.ExactArgs(4),
+		RunE: func(cmd *cobra.Command, args []string) (err error) {
+			argOrderType := args[0]
+			argAmount := args[1]
+			argPrice := args[2]
+			argMarketId := args[3]
+
+			clientCtx, err := client.GetClientTxContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			msg := types.NewMsgCreateOrder(
+				clientCtx.GetFromAddress().String(),
+				argOrderType,
+				argAmount,
+				argPrice,
+				argMarketId,
+			)
+			if err := msg.ValidateBasic(); err != nil {
+				return err
+			}
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
+		},
+	}
+
+	flags.AddTxFlagsToCmd(cmd)
+
+	return cmd
+}
+
+func CmdFillOrders() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "fill-orders [order-type] [market-id] [orders]",
+		Short: "Broadcast message FillOrders",
+		Long:  "This command expects [orders] to be an array of objects of form: {amount: 231, price:0.32}",
+		Args:  cobra.ExactArgs(3),
+		RunE: func(cmd *cobra.Command, args []string) (err error) {
+			argOrderType := args[0]
+			argMarketId := args[1]
+			argOrders := args[2]
+			var decodedOrders []*types.FillOrderItem
+			err = json.Unmarshal([]byte(argOrders), &decodedOrders)
+			if err != nil {
+				return err
+			}
+
+			clientCtx, err := client.GetClientTxContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			msg := types.NewMsgFillOrders(
+				clientCtx.GetFromAddress().String(),
+				argOrderType,
+				argMarketId,
+				decodedOrders,
+			)
+			if err := msg.ValidateBasic(); err != nil {
+				return err
+			}
+
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
+		},
+	}
+
+	flags.AddTxFlagsToCmd(cmd)
+
+	return cmd
+}
diff --git a/x/tradebin/client/cli/tx_cancel_order.go b/x/tradebin/client/cli/tx_cancel_order.go
diff --git a/x/tradebin/client/cli/tx_create_market.go b/x/tradebin/client/cli/tx_create_market.go
diff --git a/x/tradebin/client/cli/tx_create_order.go b/x/tradebin/client/cli/tx_create_order.go
diff --git a/x/tradebin/keeper/msg_server_cancel_order.go b/x/tradebin/keeper/msg_server_cancel_order.go
@@ -25,7 +25,7 @@ func (k msgServer) CancelOrder(goCtx context.Context, msg *types.MsgCancelOrder)
 
 	qm := types.QueueMessage{
 		MarketId:    msg.MarketId,
-		MessageType: types.OrderTypeCancel,
+		MessageType: types.MessageTypeCancel,
 		OrderId:     msg.OrderId,
 		OrderType:   msg.OrderType,
 		Owner:       msg.Creator,

diff --git a/x/tradebin/keeper/msg_server_cancel_order_test.go b/x/tradebin/keeper/msg_server_cancel_order_test.go
@@ -71,7 +71,7 @@ func (suite *IntegrationTestSuite) TestCancelOrder_CancelBuy_Success() {
 	suite.Require().Len(qms, 1)
 
 	suite.Require().Equal(qms[0].MarketId, order.MarketId)
-	suite.Require().Equal(qms[0].MessageType, types.OrderTypeCancel)
+	suite.Require().Equal(qms[0].MessageType, types.MessageTypeCancel)
 	suite.Require().Equal(qms[0].OrderId, order.Id)
 	suite.Require().Equal(qms[0].OrderType, order.OrderType)
 	suite.Require().Equal(qms[0].Owner, order.Owner)
@@ -100,7 +100,7 @@ func (suite *IntegrationTestSuite) TestCancelOrder_CancelSell_Success() {
 	suite.Require().Len(qms, 1)
 
 	suite.Require().Equal(qms[0].MarketId, order.MarketId)
-	suite.Require().Equal(qms[0].MessageType, types.OrderTypeCancel)
+	suite.Require().Equal(qms[0].MessageType, types.MessageTypeCancel)
 	suite.Require().Equal(qms[0].OrderId, order.Id)
 	suite.Require().Equal(qms[0].OrderType, order.OrderType)
 	suite.Require().Equal(qms[0].Owner, order.Owner)