--wip-- [skip ci]

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 {
@@ -89,7 +89,7 @@ message MarketAssetList {
   uint32 total_count = 4;
 }
 
-message MatchOrderReq {
+message PurchaseReq {
   auth.v1.InternalIAM iam = 1;
   uint64 order_id = 2;
   double amount = 3;
@@ -98,7 +98,7 @@ message MatchOrderReq {
   optional auth.v1.TFA tfa = 5;
 }
 
-message MatchOrderRes {
+message PurchaseRes {
   uint64 order_id = 1;
   double calculated_irt_amount = 2;
   double calculated_asset_amount = 3;
@@ -113,11 +113,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 +125,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 {

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