Compare commits

...

6 Commits

Author SHA1 Message Date
VQIVS c5a40d14eb fix: add maker_order_id to MakerOrder out 2025-08-05 14:52:53 +03:30
VQIVS 4f25639e98 fix: market order req side type 2025-08-05 12:05:48 +03:30
VQIVS 4a24fcb263 fix: order confirmation req, res naming
Please enter the commit message for your changes. Lines starting
2025-08-03 16:47:56 +03:30
nfel 9e3c4b9ff0 Reapply "Can Trade added to asset filter"
This reverts commit fe71cb20dd.
2025-08-03 15:56:50 +03:30
nfel 8c2305b8bd Revert "market filter - source removed in favour of type and maker_order_id"
This reverts commit a2adce3670.
2025-08-03 14:48:44 +03:30
nfel fe71cb20dd Revert "Can Trade added to asset filter"
This reverts commit a3c15365f2.
2025-08-03 14:44:58 +03:30
+14 -17
View File
@@ -19,11 +19,11 @@ enum MarketOrderSide {
enum MarketOrderStatus { enum MarketOrderStatus {
MO_UNKNOWN_MP_STATUS = 0; // Unknown 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_REFUNDED = 6; // Order is refunded by platform to user due to regulation
// MO_EXPIRED = 7; // Order is expired // MO_EXPIRED = 7; // Order is expired
} }
@@ -35,8 +35,7 @@ message CalcMarketReq {
double amount = 4; double amount = 4;
double unit_price = 5; double unit_price = 5;
MarketParticipantType participant_type = 6; MarketParticipantType participant_type = 6;
optional wallet.v1.BuyAssetSide req_side = market.v1.MarketOrderSide req_side = 7; // For Calculation : can be from asset or irt
7; // For Calculation : can be from asset or irt
} }
message CalcMarketRes { message CalcMarketRes {
@@ -44,8 +43,7 @@ message CalcMarketRes {
double calculated_asset_amount = 2; double calculated_asset_amount = 2;
wallet.v1.EffectiveCommission commission = 3; wallet.v1.EffectiveCommission commission = 3;
MarketParticipantType participant_type = 4; 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 {} message MPHistoryFilter {}
@@ -73,13 +71,13 @@ message MarketOrder {
repeated string tags = 20; repeated string tags = 20;
repeated string comment = 21; repeated string comment = 21;
optional MarketOrder source = 22; // purchase is done via this field optional MarketOrder source = 22; // purchase is done via this field
optional uint64 maker_order_id = 23;
// repeated string attachments = 14; // possible files included by // repeated string attachments = 14; // possible files included by
// seller/buyer // seller/buyer
} }
message MarketAssetListReq { 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_no = 2;
optional uint32 page_size = 3; optional uint32 page_size = 3;
} }
@@ -91,17 +89,16 @@ message MarketAssetList {
uint32 total_count = 4; uint32 total_count = 4;
} }
message PurchaseReq { message MatchOrderReq {
auth.v1.InternalIAM iam = 1; auth.v1.InternalIAM iam = 1;
uint64 order_id = 2; uint64 order_id = 2;
double amount = 3; 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 bool accepted_contract = 4;
optional auth.v1.TFA tfa = 5; optional auth.v1.TFA tfa = 5;
} }
message PurchaseRes { message MatchOrderRes {
uint64 order_id = 1; uint64 order_id = 1;
double calculated_irt_amount = 2; double calculated_irt_amount = 2;
double calculated_asset_amount = 3; double calculated_asset_amount = 3;
@@ -155,8 +152,8 @@ message OrderListFilter {
optional uint64 order_id = 11; optional uint64 order_id = 11;
optional uint64 trx_id = 12; optional uint64 trx_id = 12;
optional bool is_public = 13; optional bool is_public = 13;
optional MarketParticipantType participant_type = 14; optional bool has_source = 14;
optional uint64 maker_order_id = 15; optional uint64 source_order_id = 15;
optional string from_date = 16; optional string from_date = 16;
optional string to_date = 17; optional string to_date = 17;
optional MarketOrdersSortBy sort_by = 18; optional MarketOrdersSortBy sort_by = 18;