feat: add orderID to agreement confirm req

errors/v1/msg.proto

@@ -83,7 +83,6 @@ 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

@@ -35,7 +35,7 @@ message CalcMarketReq {
   double amount = 4;
   double unit_price = 5;
   MarketParticipantType participant_type = 6;
-  wallet.v1.BuyAssetSide req_side = 7; // For Calculation : can be from asset or irt
+  optional wallet.v1.BuyAssetSide req_side = 7; // For Calculation : can be from asset or irt
 }
 
 message CalcMarketRes {
@@ -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
 }
@@ -113,11 +112,6 @@ 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;
@@ -130,7 +124,6 @@ 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 {
@@ -158,8 +151,8 @@ 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 MarketParticipantType participant_type = 14;
+  optional uint64 maker_order_id = 15;
   optional string from_date = 16;
   optional string to_date = 17;
   optional MarketOrdersSortBy sort_by = 18;
@@ -184,8 +177,9 @@ message DeclineMarketContractReq {
 
 message ConfirmMarketContractReq {
   auth.v1.InternalIAM iam = 1;
-  uint64 agreement_id = 2;
-  optional auth.v1.TFA tfa = 3;
+  uint64 order_id = 2;
+  uint64 agreement_id = 3;
+  optional auth.v1.TFA tfa = 4;
 }
 
 message MarketContractReq {

wallet/v1/msg.proto

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