diff --git a/market/v1/msg.proto b/market/v1/msg.proto index 3e32949..5ba5249 100644 --- a/market/v1/msg.proto +++ b/market/v1/msg.proto @@ -18,7 +18,7 @@ message MarketOrder { double total_price = 7; MarketOrderType type = 8; MarketOrderStatus status = 9; - string from = 10; + int64 from = 10; float commission = 11; float completion_rate = 12; string created_at = 13; @@ -27,6 +27,7 @@ message MarketOrder { wallet.v1.TransactionList trx = 16; repeated string tags = 17; repeated string comment = 18; + optional MarketOrder parent = 19; // purchase is done via this field // repeated string attachments = 14; // possible files included by seller/buyer } @@ -34,6 +35,7 @@ message MarketAssetListReq{ base.v1.BaseQueryParam base = 1; optional auth.v1.InternalIAM iam = 2; // If not set, will returns only public orders which are limited by a white list } + message MarketAssetList{ repeated wallet.v1.Asset list = 1; } diff --git a/market/v1/srv.proto b/market/v1/srv.proto index 2f72e8c..eb4c9ce 100644 --- a/market/v1/srv.proto +++ b/market/v1/srv.proto @@ -10,7 +10,7 @@ service MarketplaceSrv { rpc GetMarketOrderDet(auth.v1.IdReqWithIAM) returns (MarketOrder); // details of an order by id rpc GetAllOrderList(OrderListFilter) returns (MarketOrderList); // list of all orders (seller and buyer combined) - rpc GetAssetList(MarketAssetListReq) returns (MarketAssetList); // assets that can be listed in marketplace + rpc GetMarketAssetList(MarketAssetListReq) returns (MarketAssetList); // assets that can be listed in marketplace rpc GetSellerList(OrderListFilter) returns (MarketOrderList); // list of orders by sellers rpc GetBuyerList(OrderListFilter) returns (MarketOrderList); // list of orders by buyers @@ -18,7 +18,6 @@ service MarketplaceSrv { rpc NewSellOrder(NewMarketReq) returns (MarketOrder); // insert new sell order to market rpc NewBuyOrder(NewMarketReq) returns (MarketOrder); // insert new buy order to market - rpc Purchace(PurchaseReq) returns (PurchaseRes); // purchase from an order rpc CancelOrder(auth.v1.IdReqWithIAM) returns (base.v1.StatusRes); // cancel an order diff --git a/wallet/v1/msg.proto b/wallet/v1/msg.proto index 7339ebd..b51a347 100644 --- a/wallet/v1/msg.proto +++ b/wallet/v1/msg.proto @@ -239,6 +239,9 @@ enum TransactionType { WAGE = 7; EXTERNAL_DEPOSIT = 8; INTERNAL_DEPOSIT = 9; + MARKETPLACE_BUY = 10; + MARKETPLACE_SELL = 11; + LOCK = 12; } enum TransactionStatus {