feat: add orderID to agreement confirm req

auth/v1/msg.proto

@@ -266,8 +266,8 @@ enum TfaStateEnum {
   INTERNAL_TRANSFER = 2;
   EXTERNAL_TRANSFER = 3;
   REDEEM_TOKEN = 4;
-  MARKET_PLACE_MAKER = 5;
-  MARKET_PLACE_TAKER = 6;
+  MARKET_PLACE_PURCHASE = 5;
+  MARKET_PLACE_ORDER_CREATE = 6;
   MARKET_PLACE_ORDER_CANCEL = 7;
   IRT_WITHDRAWAL = 8;
   IRT_DEPOSIT = 9;

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;
@@ -103,7 +102,6 @@ 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;
@@ -116,6 +114,7 @@ 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

@@ -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 {
@@ -112,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;
@@ -129,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 {
@@ -157,13 +151,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 MarketParticipantType participant_type = 18;
-  optional MarketOrdersSortBy sort_by = 19;
-  optional uint32 page_no = 21;
-  optional uint32 page_size = 22;
+  optional MarketOrdersSortBy sort_by = 18;
+  optional uint32 page_no = 19;
+  optional uint32 page_size = 20;
 }
 
 /* Contract */
@@ -183,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 {

market/v1/srv.proto

@@ -7,6 +7,7 @@ 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
@@ -22,5 +23,4 @@ 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; //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