--wip-- [skip ci]

Signed-off-by: nfel <nfilsaraee@gmail.com>

errors/v1/msg.proto

@@ -83,6 +83,7 @@ enum ErrCode {
   MARKET_ORDER_CANCELED = 7023;
   MARKET_ORDER_FAILED = 7024;
   MARKET_ORDER_UNKNOWN = 7025;
+  MARKET_ORDER_UNSUPPORTED_PARTICIPANT_TYPE = 7045;
   ASSET_CAN_NOT_BUY = 7026;
   ASSET_BUY_PRICE_IS_ZERO = 7019;
   MARKET_ORDER_MATCHING_ERR_REFUND = 7128;

market/v1/msg.proto

@@ -19,11 +19,11 @@ enum MarketOrderSide {
 
 enum MarketOrderStatus {
   MO_UNKNOWN_MP_STATUS = 0; // Unknown
-  MO_CREATED = 1;           // Order is just created and awaits confirmation
+  MO_CREATED = 1; // Order is just created and awaits confirmation
-  MO_OPEN = 2;              // Order is open and waiting to be completed
+  MO_OPEN = 2; // Order is open and waiting to be completed
-  MO_CANCEL = 3;            // Cancelled by user
+  MO_CANCEL = 3; // Cancelled by user
-  MO_COMPLETED = 4;         // Order is completed
+  MO_COMPLETED = 4; // Order is completed
-  MO_FAILED = 5;            // Order is failed - bad trx , etc.
+  MO_FAILED = 5; // Order is failed - bad trx , etc.
   MO_REFUNDED = 6; // Order is refunded by platform to user due to regulation
   // MO_EXPIRED = 7; // Order is expired
 }
@@ -35,8 +35,7 @@ message CalcMarketReq {
   double amount = 4;
   double unit_price = 5;
   MarketParticipantType participant_type = 6;
-  optional wallet.v1.BuyAssetSide req_side =
+  wallet.v1.BuyAssetSide req_side = 7; // For Calculation : can be from asset or irt
-      7; // For Calculation : can be from asset or irt
 }
 
 message CalcMarketRes {
@@ -44,8 +43,7 @@ message CalcMarketRes {
   double calculated_asset_amount = 2;
   wallet.v1.EffectiveCommission commission = 3;
   MarketParticipantType participant_type = 4;
-  wallet.v1.BuyAssetSide req_side =
+  wallet.v1.BuyAssetSide req_side = 5; // For Calculation : can be from asset or irt
-      5; // For Calculation : can be from asset or irt
 }
 
 message MPHistoryFilter {}
@@ -73,13 +71,13 @@ message MarketOrder {
   repeated string tags = 20;
   repeated string comment = 21;
   optional MarketOrder source = 22; // purchase is done via this field
+  optional uint64 maker_order_id = 23;
   // repeated string attachments = 14; // possible files included by
   // seller/buyer
 }
 
 message MarketAssetListReq {
-  optional auth.v1.InternalIAM iam =
+  optional auth.v1.InternalIAM iam = 1; // If not set, will returns only public orders which are limited by a
-      1; // If not set, will returns only public orders which are limited by a
   optional uint32 page_no = 2;
   optional uint32 page_size = 3;
 }
@@ -91,17 +89,16 @@ message MarketAssetList {
   uint32 total_count = 4;
 }
 
-message PurchaseReq {
+message MatchOrderReq {
   auth.v1.InternalIAM iam = 1;
   uint64 order_id = 2;
   double amount = 3;
-  wallet.v1.BuyAssetSide req_side =
+  wallet.v1.BuyAssetSide req_side = 7; // For Calculation : can be from asset or irt
-      7; // For Calculation : can be from asset or irt
   optional bool accepted_contract = 4;
   optional auth.v1.TFA tfa = 5;
 }
 
-message PurchaseRes {
+message MatchOrderRes {
   uint64 order_id = 1;
   double calculated_irt_amount = 2;
   double calculated_asset_amount = 3;
@@ -116,6 +113,11 @@ message MarketOrderList {
   uint32 total_count = 4;
 }
 
+/*
+ * participant_type: IS Maker/Taker
+ * side: IS Buying/Selling
+ * req_side: IS input (amount) in irt/asset 
+ * */
 message NewMarketReq {
   auth.v1.InternalIAM iam = 1;
   int64 asset_id = 2;
@@ -128,6 +130,7 @@ message NewMarketReq {
   wallet.v1.BuyAssetSide req_side = 7;
   MarketOrderSide side = 8;
   // TODO: maker market order as optional
+  optional uint64 maker_order_id = 9;
 }
 
 enum MarketOrdersSortBy {
@@ -155,8 +158,8 @@ message OrderListFilter {
   optional uint64 order_id = 11;
   optional uint64 trx_id = 12;
   optional bool is_public = 13;
-  optional MarketParticipantType participant_type = 14;
+  optional bool has_source = 14;
-  optional uint64 maker_order_id = 15;
+  optional uint64 source_order_id = 15;
   optional string from_date = 16;
   optional string to_date = 17;
   optional MarketOrdersSortBy sort_by = 18;

wallet/v1/msg.proto

@@ -690,11 +690,11 @@ message BuyAssetRes {
 /* Contract */
 enum ContractType {
   CONTRACT_TYPE_ICO = 0;
-  CONTRACT_TYPE_MARKET = 1;
+  CONTRACT_TYPE_MARKET = 1; //FIXME: Please remove this :)
   CONTRACT_TYPE_BNPL = 2;
   CONTRACT_TYPE_REDEEM = 3;
-  CONTRACT_TYPE_MARKE_MAKER = 4;
+  CONTRACT_TYPE_MARKET_MAKER = 4;
-  CONTRACT_TYPE_MARKE_TAKER = 5;
+  CONTRACT_TYPE_MARKET_TAKER = 5;
 }
 
 // agreement_id