Merge pull request 'feat: decline market contract rpc' (#31) from feat/decline-contract into v2

Reviewed-on: #31

auth/v1/msg.proto

@@ -34,7 +34,7 @@ message PermissionList {
   repeated Permission list = 1;
   uint32 page_no = 2;
   uint32 page_size = 3;
-   uint32 total_count = 4;
+  uint32 total_count = 4;
 }
 
 /*
@@ -206,7 +206,7 @@ message BankInfoList {
   repeated BankInfo list = 1;
   uint32 page_no = 2;
   uint32 page_size = 3;
-   uint32 total_count = 4;
+  uint32 total_count = 4;
 }
 
 // Status 0: Fail Verify, 1: Verified, 2: Does not Match user's credential , 3:
@@ -266,8 +266,8 @@ enum TfaStateEnum {
   INTERNAL_TRANSFER = 2;
   EXTERNAL_TRANSFER = 3;
   REDEEM_TOKEN = 4;
-  MARKET_PLACE_PURCHASE = 5;
-  MARKET_PLACE_ORDER_CREATE = 6;
+  MARKET_PLACE_MAKER = 5;
+  MARKET_PLACE_TAKER = 6;
   MARKET_PLACE_ORDER_CANCEL = 7;
   IRT_WITHDRAWAL = 8;
   IRT_DEPOSIT = 9;
@@ -300,5 +300,5 @@ message BasicUserInfoList {
   repeated BasicUserInfo list = 1;
   uint32 page_no = 2;
   uint32 page_size = 3;
-   uint32 total_count = 4;
+  uint32 total_count = 4;
 }

market/v1/msg.proto

@@ -71,7 +71,6 @@ 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
 }
@@ -158,13 +157,13 @@ message OrderListFilter {
   optional uint64 order_id = 11;
   optional uint64 trx_id = 12;
   optional bool is_public = 13;
-  optional bool has_source = 14;
-  optional uint64 source_order_id = 15;
+  optional uint64 maker_order_id = 15;
   optional string from_date = 16;
   optional string to_date = 17;
-  optional MarketOrdersSortBy sort_by = 18;
-  optional uint32 page_no = 19;
-  optional uint32 page_size = 20;
+  optional MarketParticipantType participant_type = 18;
+  optional MarketOrdersSortBy sort_by = 19;
+  optional uint32 page_no = 21;
+  optional uint32 page_size = 22;
 }
 
 /* Contract */

market/v1/srv.proto

@@ -7,7 +7,6 @@ import "base/v1/msg.proto";
 import "market/v1/msg.proto";
 
 service MarketplaceSrv {
-
   rpc MarketplaceSrvHealth(base.v1.Empty) returns (base.v1.StatusRes);
 
   rpc GetMarketPubHistory(OrderListFilter) returns (MarketOrderList); // This is for public market
@@ -23,4 +22,5 @@ service MarketplaceSrv {
   rpc NewMarketOrder(NewMarketReq) returns (MarketOrder); // insert new buy order to market
   rpc GenerateMarketContract(MarketContractReq) returns (ContractMarketRes);
   rpc ConfirmMarketContract(ConfirmMarketContractReq) returns (base.v1.StatusRes);
+  rpc DeclineMarketContract(DeclineMarketContractReq) returns (base.v1.StatusRes);
 }