From b774a4602d1312893b3d537aa052fdc3fb945c8b Mon Sep 17 00:00:00 2001 From: nfel Date: Tue, 18 Feb 2025 13:07:50 +0330 Subject: [PATCH] MarketPlace: freezed balance added in wallet Signed-off-by: nfel --- market/v1/msg.proto | 5 +++-- market/v1/srv.proto | 3 --- wallet/v1/msg.proto | 37 +++++++++++++++++++++++++++++++------ 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/market/v1/msg.proto b/market/v1/msg.proto index a803b2f..5c8ffa9 100644 --- a/market/v1/msg.proto +++ b/market/v1/msg.proto @@ -19,8 +19,8 @@ message MarketOrder { MarketOrderSide side = 8; MarketOrderStatus status = 9; int64 from = 10; - float commission = 11; - float completion_rate = 12; + wallet.v1.Commission commission = 11; + float completed_amount = 12; string created_at = 13; string updated_at = 14; bool is_public = 15; @@ -82,6 +82,7 @@ enum MarketOrderStatus { MO_REFUNDED = 5; // Order is refunded by platform to user due to regulation // MO_EXPIRED = 4; // Order is expired } + message OrderListFilter { optional auth.v1.InternalIAM iam = 1; base.v1.BaseQueryParam base = 2; diff --git a/market/v1/srv.proto b/market/v1/srv.proto index daa09bf..042b8ea 100644 --- a/market/v1/srv.proto +++ b/market/v1/srv.proto @@ -20,7 +20,4 @@ service MarketplaceSrv { rpc GetMarketPubHistory(OrderListFilter) returns (MarketOrderList); // This is for public market rpc GetUserMarketHistory(OrderListFilter) returns (MarketOrderList); // list of order + purchase related to buying an asset - - // rpc GetBuyHistory(OrderListFilterWithIAM) returns (MarketOrderList); // list of order + purchase related to buying an asset - // rpc GetSellHistory(OrderListFilterWithIAM) returns (MarketOrderList); // list of order + purchase related to selling an asset } diff --git a/wallet/v1/msg.proto b/wallet/v1/msg.proto index b51a347..3ee01ea 100644 --- a/wallet/v1/msg.proto +++ b/wallet/v1/msg.proto @@ -183,6 +183,7 @@ message BNPLInfo { string created_at = 13; string expires_at = 14; } + message BNPLList { repeated BNPLInfo list = 1; } @@ -193,7 +194,7 @@ message BNPLList { message WalletList { repeated Wallet list = 1; - // optional base.v1.Pagination pagination = 2; + // optional base.v1.Pagination pagination = 2; double available_balance = 3; double locked_balance = 4; double total_balance = 5; @@ -207,11 +208,23 @@ message Wallet { int64 federation_id = 5; Federation federation_info = 6; double balance = 7; - string updated_at = 8; - string created_at = 9; - string wallet_code = 10; - bool accepted_terms = 11; - bool is_locked = 12; + double frozen_balance = 8; + string updated_at = 9; + string created_at = 10; + string wallet_code = 11; + bool accepted_terms = 12; + bool is_locked = 13; +} + +// Frozen Asset is asset locked due to reservation +message FrozenAsset { + uint64 id = 1; + int64 asset_id = 2; + int64 wallet_id = 4; + double amount = 5; + string created_at = 6; + string updated_at = 7; + optional string expires_at = 8; } message UserInitWalletReq { @@ -445,3 +458,15 @@ message Network { message NetworkList { repeated Network list = 1; } + +message Commission { + uint64 id = 1; + string name = 2; + double service = 3; + double tax = 4; + double total = 5; + string collector = 6; + optional string description = 7; + string updated_at = 10; + string created_at = 11; +}