feat: add contract not found err

Reviewed-on: #30

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_MAKER = 5;
-  MARKET_PLACE_ORDER_CREATE = 6;
+  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;
 }

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;
@@ -102,6 +103,7 @@ enum ErrCode {
   LOW_REQUEST_AMOUNT = 7014;
   AGREEMENT_ALREADY_ACCEPTED = 7015;
   CONTRACT_ALREADY_GENERATED = 7016;
+  CONTRACT_NOT_FOUND = 7080; // FIXME: Err numb er should be changed
   NIL_AUTH = 7017;
   CAN_NOT_BUY_AND_DEPOSIT = 7018;
   WHITELIST_ALREADY_USED = 7027;
@@ -114,7 +116,6 @@ enum ErrCode {
   NOT_ENOUGH_LOCKED_BALANCE = 7034;
   NOT_ENOUGH_BALANCE_TO_LOCK = 7035;
 
-
   // Server errors
   SERVER_ERROR_FREEZED_BALANCE_NEGATIVE = 8000;
   SERVER_ERROR_NIL_DB_TX = 8001;

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 {}
@@ -78,8 +76,7 @@ message MarketOrder {
 }
 
 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 +88,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 +112,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 +129,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,13 +157,13 @@ message OrderListFilter {
   optional uint64 order_id = 11;
   optional uint64 trx_id = 12;
   optional bool is_public = 13;
-  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;
+  optional MarketParticipantType participant_type = 18;
-  optional uint32 page_no = 19;
+  optional MarketOrdersSortBy sort_by = 19;
-  optional uint32 page_size = 20;
+  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);
 }

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