Merge pull request 'V2: updating to new proto schema. domain seperated packages' (#36) from v2 into dev

Reviewed-on: #36

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;
 }
 
 /*
@@ -43,6 +43,7 @@ message PermissionList {
 
 message UserSendOtpReq {
   string mobile = 1;
+  string referral_code = 2;
 }
 message UserSendOtpRes {
   int64 expired_at = 1;
@@ -55,6 +56,7 @@ message UserSendOtpRes {
 message UserLoginReq {
   string mobile = 1;
   string otp_code = 2;
+  string referral_code = 3;
 }
 message UserRefreshTokenReq {
   string refresh_token = 1;
@@ -128,6 +130,7 @@ message User {
   string email = 4;
   UserStatus status = 5;
   repeated int64 roles = 6;
+  int64 referrer_user_id = 7;
 }
 
 message UserAddress {
@@ -185,6 +188,7 @@ message UserIdentityBasic {
   string first_name = 4;
   string last_name = 5;
   string wallet_address = 6;
+  bool is_identity_verified = 7;
 }
 
 message UserUpdateIdentityReq {
@@ -206,7 +210,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 +270,8 @@ enum TfaStateEnum {
   INTERNAL_TRANSFER = 2;
   EXTERNAL_TRANSFER = 3;
   REDEEM_TOKEN = 4;
-  MARKET_PLACE_PURCHASE = 5;
-  MARKET_PLACE_ORDER_CREATE = 6;
+  MARKET_PLACE_MAKER = 5;
+  MARKET_PLACE_TAKER = 6;
   MARKET_PLACE_ORDER_CANCEL = 7;
   IRT_WITHDRAWAL = 8;
   IRT_DEPOSIT = 9;
@@ -300,5 +304,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

@@ -39,6 +39,7 @@ enum ErrCode {
   INVALID_BUY_AMOUNT = 2015;
   INVALID_BUY_AMOUNT_MAX = 2016;
   INVALID_BUY_AMOUNT_MIN = 2017;
+  INVALID_ARGUMENT_TFA_REQUIRED = 2018;
 
   // Resource errors
   NOT_FOUND = 3000;
@@ -50,6 +51,8 @@ enum ErrCode {
   BANK_INFO_NOT_FOUND = 3007;
   RECIPIENT_NOT_FOUND = 3008;
   USER_NOT_FOUND = 3009;
+  INVALID_REFERRAL_CODE = 3011;
+  MARKET_AGREEMENT_ALREADY_ACCEPTED = 3010;
 
   // Resource state errors
   ASSET_NOT_ACTIVE = 4000;
@@ -83,6 +86,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 +106,7 @@ enum ErrCode {
   LOW_REQUEST_AMOUNT = 7014;
   AGREEMENT_ALREADY_ACCEPTED = 7015;
   CONTRACT_ALREADY_GENERATED = 7016;
+  CONTRACT_NOT_FOUND = 7080;
   NIL_AUTH = 7017;
   CAN_NOT_BUY_AND_DEPOSIT = 7018;
   WHITELIST_ALREADY_USED = 7027;
@@ -113,6 +118,8 @@ enum ErrCode {
   MOBILE_NATIONAL_ID_MISS_MATCH = 7033;
   NOT_ENOUGH_LOCKED_BALANCE = 7034;
   NOT_ENOUGH_BALANCE_TO_LOCK = 7035;
+  IPG_GEN_TOKEN_FAILED = 7036;
+  USER_INFO_NATIONAL_ID_BIRTHDATE_MISS_MATCH = 7037;
 
 
   // Server errors

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_OPEN = 2;              // Order is open and waiting to be completed
-  MO_CANCEL = 3;            // Cancelled by user
-  MO_COMPLETED = 4;         // Order is completed
-  MO_FAILED = 5;            // Order is failed - bad trx , etc.
+  MO_CREATED = 1; // Order is just created and awaits confirmation
+  MO_OPEN = 2; // Order is open and waiting to be completed
+  MO_CANCEL = 3; // Cancelled by user
+  MO_COMPLETED = 4; // Order is completed
+  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
 }
@@ -34,18 +34,16 @@ message CalcMarketReq {
   int64 counter_asset_id = 3;
   double amount = 4;
   double unit_price = 5;
-  MarketParticipantType type = 6;
-  wallet.v1.BuyAssetSide req_side =
-      7; // For Calculation : can be from asset or irt
+  MarketParticipantType participant_type = 6;
+  wallet.v1.BuyAssetSide req_side = 7; // For Calculation : can be from asset or irt
 }
 
 message CalcMarketRes {
   double calculated_irt_amount = 1;
   double calculated_asset_amount = 2;
   wallet.v1.EffectiveCommission commission = 3;
-  MarketParticipantType type = 4;
-  wallet.v1.BuyAssetSide req_side =
-      5; // For Calculation : can be from asset or irt
+  MarketParticipantType participant_type = 4;
+  wallet.v1.BuyAssetSide req_side = 5; // For Calculation : can be from asset or irt
 }
 
 message MPHistoryFilter {}
@@ -61,24 +59,24 @@ message MarketOrder {
   MarketOrderSide side = 8;
   MarketOrderStatus status = 9;
   int64 from = 10;
-  auth.v1.UserIdentityBasic from_identity = 11;
-  wallet.v1.Commission commission = 12;
-  double completed_amount = 13;
-  double available_amount = 14;
-  string created_at = 15;
-  string updated_at = 16;
-  bool is_public = 17;
-  wallet.v1.TransactionList trx = 18;
-  repeated string tags = 19;
-  repeated string comment = 20;
-  optional MarketOrder source = 21; // purchase is done via this field
+  MarketParticipantType participant_type = 11;
+  auth.v1.UserIdentityBasic from_identity = 12;
+  wallet.v1.Commission commission = 13;
+  double completed_amount = 14;
+  double available_amount = 15;
+  string created_at = 16;
+  string updated_at = 17;
+  bool is_public = 18;
+  wallet.v1.TransactionList trx = 19;
+  repeated string tags = 20;
+  repeated string comment = 21;
+  optional MarketOrder source = 22; // purchase is done via this field
   // repeated string attachments = 14; // possible files included by
   // seller/buyer
 }
 
 message MarketAssetListReq {
-  optional auth.v1.InternalIAM iam =
-      1; // If not set, will returns only public orders which are limited by a
+  optional auth.v1.InternalIAM iam = 1; // If not set, will returns only public orders which are limited by a
   optional uint32 page_no = 2;
   optional uint32 page_size = 3;
 }
@@ -90,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 =
-      7; // For Calculation : can be from asset or irt
+  wallet.v1.BuyAssetSide req_side = 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;
@@ -115,18 +112,24 @@ 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;
   int64 counter_asset_id = 3;
   double amount = 4;
   double unit_price = 5;
-  MarketParticipantType type = 6;
-  wallet.v1.BuyAssetSide req_side =
-      7; // For Calculation : can be from asset or irt
+  // TODO: Change name
+  MarketParticipantType participant_type = 6;
+  // For Calculation : can be from asset or irt
+  wallet.v1.BuyAssetSide req_side = 7;
   MarketOrderSide side = 8;
-  optional auth.v1.TFA tfa = 9;
-  optional bool accepted_contract = 10;
+  // TODO: maker market order as optional
+  optional uint64 maker_order_id = 9;
 }
 
 enum MarketOrdersSortBy {
@@ -150,15 +153,44 @@ message OrderListFilter {
   repeated string to = 7;
   optional double starting_price = 8;
   optional double ending_price = 9;
-  repeated wallet.v1.Asset asset = 10;
+  repeated uint64 asset = 10;
   optional uint64 order_id = 11;
   optional uint64 trx_id = 12;
   optional bool is_public = 13;
-  optional bool has_source = 14;
-  optional uint64 source_order_id = 15;
+  optional uint64 maker_order_id = 15;
   optional string from_date = 16;
   optional string to_date = 17;
-  optional MarketOrdersSortBy sort_by = 18;
-  optional uint32 page_no = 19;
-  optional uint32 page_size = 20;
+  optional MarketParticipantType participant_type = 18;
+  optional MarketOrdersSortBy sort_by = 19;
+  optional uint32 page_no = 21;
+  optional uint32 page_size = 22;
+}
+
+/* Contract */
+message ContractMarketRes {
+  string link = 1;
+  uint64 asset_id = 2;
+  uint64 agreement_id = 3;
+  uint64 transaction_id = 4;
+  string contract_hash = 5;
+  string contract_content = 6;
+}
+
+message DeclineMarketContractReq {
+  auth.v1.InternalIAM iam = 1;
+  uint64 agreement_id = 2;
+}
+
+message ConfirmMarketContractReq {
+  auth.v1.InternalIAM iam = 1;
+  uint64 agreement_id = 2;
+  optional auth.v1.TFA tfa = 3;
+}
+
+message MarketContractReq {
+  auth.v1.InternalIAM iam = 1;
+  // uint64 asset_id = 2;
+  uint64 order_id = 2; // Maker OrderID
+  // double amount = 4;
+  // wallet.v1.BuyAssetSide req_side = 5;
 }

market/v1/srv.proto

@@ -7,21 +7,19 @@ import "base/v1/msg.proto";
 import "market/v1/msg.proto";
 
 service MarketplaceSrv {
-  rpc CalcMarketOrder(CalcMarketReq) returns (CalcMarketRes);
-
   rpc MarketplaceSrvHealth(base.v1.Empty) returns (base.v1.StatusRes);
 
-  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 GetMarketAssetList(MarketAssetListReq) returns (MarketAssetList); //  assets that can be listed in marketplace
-
-  rpc NewMarketOrder(NewMarketReq) returns (MarketOrder); // insert new buy order to market
-
-  rpc Purchase(PurchaseReq) returns (PurchaseRes); // purchase from an order
-
-  rpc CancelOrder(auth.v1.IdReqWithIAMAndTFA) returns (base.v1.StatusRes); // cancel an order
-
   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 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 GetMarketAssetList(MarketAssetListReq) returns (MarketAssetList); //  assets that can be listed in marketplace
+
+  rpc CalcMarketOrder(CalcMarketReq) returns (CalcMarketRes);
+
+  rpc CancelOrder(auth.v1.IdReqWithIAMAndTFA) returns (base.v1.StatusRes); // cancel an order
+
+  rpc NewMarketOrder(NewMarketReq) returns (MarketOrder); // insert new buy order to market
+  rpc GenerateMarketContract(MarketContractReq) returns (ContractMarketRes);
+  rpc ConfirmMarketContract(ConfirmMarketContractReq) returns (base.v1.StatusRes);
 }

wallet/v1/internal_srv.proto

@@ -7,10 +7,17 @@ import "wallet/v1/msg.proto";
 
 service InternalWalletSrv {
   rpc InternalWalletSrvHealth(base.v1.Empty) returns (base.v1.StatusRes);
+
   // Lock And Release Assets
   rpc LockAsset(LockAssetReq) returns (base.v1.StatusRes);
   rpc ReleaseAsset(LockAssetReq) returns (base.v1.StatusRes);
 
   rpc CollectCommission(CommissionReq) returns (CommissionRes);
-  rpc RefundCommission(CommissionReq) returns (CommissionRes);
+  rpc RefundCommission(RefundCommissionReq) returns (CommissionRes);
+
+  // Calculate stellar pub-priv key based on national id
+  rpc GetPublicKeyByNationalID(NationalIDReq) returns (PubKeyRes);
+
+    // Commission Logs
+  rpc InitReferrerCommissionLog(InitReferrerCommissionLogIn) returns (base.v1.Empty);
 }

wallet/v1/msg.proto

@@ -6,10 +6,12 @@ import "auth/v1/msg.proto";
 import "base/v1/msg.proto";
 
 /*
-   INTERNAL DATA
+   INTERNAL DATA;
 */
 
-message InternalTransactionData { int64 transaction_id = 1; }
+message InternalTransactionData {
+  int64 transaction_id = 1;
+}
 
 /*
    Federation
@@ -99,7 +101,7 @@ message Asset {
   string image = 8;
   string description = 9;
   string url = 10;
-  int64 buy_unit_price = 11;
+  // int64 buy_unit_price = 11;
   double buy_min_amount = 12;
   double buy_max_amount = 13;
   bool is_active = 20;
@@ -155,7 +157,7 @@ message AssetList {
 
 message AssetFilter {
   repeated int64 ids = 1;
-  repeated AssetType type = 2;       // AssetType
+  repeated AssetType type = 2; // AssetType
   repeated AssetType token_type = 3; // AssetType
   repeated AssetStatus status = 4;
   repeated string name = 5;
@@ -163,8 +165,9 @@ message AssetFilter {
   optional bool can_sell = 7;
   optional bool can_deposit = 8;
   optional bool can_withdraw = 9;
-  optional bool is_active = 10;
-  optional string search = 11; // Not yet implemented !
+  optional bool can_trade = 10;
+  optional bool is_active = 11;
+  optional string search = 12; // Not yet implemented !
 }
 
 message AssetDiscountReq {
@@ -181,15 +184,15 @@ message AssetDiscountRes {
   double static_amount = 4;
   double percentage = 5;
   double max_amount = 6;
-  double effective_amount =
-      7; // based of asset price and discount amount in req
+  double effective_amount = 7; // based of asset price and discount amount in req
   optional int64 supported_asset = 8;
 }
 
 message AssetPrice {
   string updated_at = 1;
   double market_price = 2;
-  double platform_price = 3;
+  double ico_price = 3;
+  double current_price = 4;
 }
 
 message GetAssetReq {
@@ -197,7 +200,9 @@ message GetAssetReq {
   optional string code = 3;
 }
 
-message AssetMeta { PropertyMeta property = 1; }
+message AssetMeta {
+  PropertyMeta property = 1;
+}
 
 message PropertyMeta {
   string description = 1;
@@ -211,15 +216,14 @@ message PropertyMeta {
   string usage_type = 9;
   string completion_date = 10;
   string user_agreement_url = 11;
-  string location = 12;
-  float lat = 13;
-  float lng = 14;
-  string map_link = 15;
-  PropertyDetail detail = 16;
+  float lat = 12;
+  float lng = 13;
+  string map_link = 14;
+  PropertyDetail detail = 15;
 }
 
 message PropertyDetail {
-  repeated Content badge = 1;   // 2>
+  repeated Content badge = 1; // 2>
   repeated Content content = 2; // 4>
 }
 
@@ -292,8 +296,7 @@ message UserBNPLReq {
   optional float amount = 7;
   optional PaymentPeriodInfo payment_period = 8;
   optional bool has_agreed_contract = 9;
-  optional int32 current_step =
-      10; // Can be useful for admin to change the current step
+  optional int32 current_step = 10; // Can be useful for admin to change the current step
   optional int64 asset_id = 11;
 }
 
@@ -352,6 +355,7 @@ enum TransactionType {
   IRT_DEPOSIT = 13;
   IRT_WITHDRAWAL = 14;
   COMMISSION = 15;
+  REFERRAL_COMMISSION = 16;
 }
 
 enum TransactionStatus {
@@ -361,6 +365,7 @@ enum TransactionStatus {
   CREATED = -1;
   PENDING_TRX = 1;
   SUCCESSFUL = 2;
+  PENDING_ADMIN = 3;
 }
 
 message Transaction {
@@ -386,6 +391,13 @@ message Transaction {
   optional string from_public_key = 19;
   optional string to_public_key = 20;
   double token_price = 21;
+  BalanceChange balance_change = 22;
+}
+
+enum BalanceChange{
+  NO_CHANGE = 0;
+  INCREASE = 1;
+  DECREASE = 2;
 }
 
 message TransactionListFilter {
@@ -431,7 +443,7 @@ message TransferAssetRes {
 }
 
 /*
-   Redeem Token
+   Redeem Token;
 */
 message RedeemTokenReq {
   auth.v1.InternalIAM iam = 1;
@@ -481,10 +493,12 @@ message NationalIDReq {
   string national_id = 2;
 }
 
-message PubKeyRes { string pub_key = 1; }
+message PubKeyRes {
+  string pub_key = 1;
+}
 
 /*
-   Network Details
+   Network Details;
 */
 enum NetworkType {
   UNKNOWN_NETWORK_TYPE = 0;
@@ -554,12 +568,51 @@ message EffectiveCommission {
   double total = 3;
 }
 
+message RefundCommissionReq {
+  auth.v1.UserIdentityBasic user = 3;
+  uint64 commission_log_id = 1;
+}
 message CommissionReq {
   uint64 commission_id = 1;
   double amount = 2;
   auth.v1.UserIdentityBasic user = 3;
 }
-message CommissionRes {}
+
+message CommissionRes {
+  uint64 commission_log_id = 1;
+}
+
+message InitReferrerCommissionLogIn {
+  int64 referrer_id = 1;
+  int64 user_id = 2;
+  double amount = 3;
+}
+
+message ReferrerCommissionLogOut {
+  double amount = 1;
+  string mobile = 2;
+  bool is_identity_verified = 3;
+  double commission_percentage = 4;
+}
+message ReferrerCommissionLogsList {
+  repeated ReferrerCommissionLogOut list = 1;
+  uint32 page_no = 2;
+  uint32 page_size = 3;
+  uint32 total_count = 4;
+}
+
+message TotalReferralCommissionIn {
+  int64 referrer_id = 1;
+}
+
+message TotalReferralCommissionOut {
+  double claimed = 1;
+  double unclaimed = 2;
+}
+
+message ClaimReferralCommissionIn {
+  auth.v1.User user = 1;
+}
 
 /*
  * IPG - Internet Payment Gateway
@@ -575,6 +628,34 @@ message CommissionRes {}
 //   auth.v1.BankInfo bank_info = 2; // BankInfo
 // }
 
+enum AccountingType {
+  ACCOUNTING_TYPE_WITHDRAW = 0;
+
+  // Deposits
+  ACCOUNTING_TYPE_DEPOSIT_IPG = 10;
+  ACCOUNTING_TYPE_DEPOSIT_BANK_ACCOUNT = 11;
+  ACCOUNTING_TYPE_DEPOSIT_IBAN = 12;
+  ACCOUNTING_TYPE_DEPOSIT_CARD = 13;
+  ACCOUNTING_TYPE_DEPOSIT_DIRECT_DEBIT = 14;
+
+  // Withdraw
+  ACCOUNTING_TYPE_WITHDRAW_IBAN = 20; // User request to receive irt via iban
+  ACCOUNTING_TYPE_WITHDRAW_CARD = 21; // User request to receive irt via card no
+  ACCOUNTING_TYPE_WITHDRAW_BANK_ACCOUNT = 22; // User request to receive irt via bank
+  ACCOUNTING_TYPE_WITHDRAW_IPG_REFUND = 23;
+
+  // ???
+}
+enum AccountingStatus {
+  ACCOUNTING_STATUS_UNKNOWN = 0;
+  ACCOUNTING_STATUS_CREATED = 1;
+  ACCOUNTING_STATUS_PENDING = 2;
+  ACCOUNTING_STATUS_SUCCESS = 3;
+  ACCOUNTING_STATUS_FAILED = 4;
+  ACCOUNTING_STATUS_CANCELLED = 5;
+  ACCOUNTING_STATUS_REJECTED = 6;
+}
+
 enum IPGStatus {
   IPG_SUCCESS = 0;
   IPG_FAILED = -1;
@@ -584,32 +665,90 @@ enum IPGStatus {
 // represent the information regarding the sale of the token
 message IPGGetTokenReq {
   auth.v1.InternalIAM iam = 1;
-  int64 asset_id = 2;
-  double amount = 3;
-  optional uint64 discount_code = 4;
+  double amount = 2;
+  repeated string allowed_card_numbers = 3;
 }
 
 // represent the information regarding the ipg gateway
 message IPGGetTokenRes {
   string url = 1;
-  int64 unit_price = 2;
-  int64 total_price = 3;
-  double amount = 4;
-  string asset = 5;
-  optional uint64 discount_code = 6;
+  int64 amount = 2;
 }
 
 message IPGConfirmReq {
-  string ref_id = 1;
-  string res_code = 2;
-  string sale_order_id = 3;
-  string sale_reference_id = 4;
-  string card_holder_info = 5;
-  string card_holder_pan = 6;
-  string final_amount = 7;
+  string redirected_url = 1; // This field includes all of ipg's query params
+  // string ref_id = 1;
+  // string res_code = 2;
+  // string sale_order_id = 3;
+  // string sale_reference_id = 4;
+  // string card_holder_info = 5;
+  // string card_holder_pan = 6;
+  // string amount = 7;
 }
 
-message IPGConfirmRes { string receipt_link = 1; }
+
+message WithdrawLog {
+  uint64 id = 1;
+  Accounting accounting = 2;
+  string rrn = 3;
+  int64 amount = 4;
+  AccountingStatus status = 5;
+  string created_at = 6;
+  string updated_at = 7;
+  optional Transaction transaction = 8;
+  optional auth.v1.BankInfo bankinfo_id = 10;
+  optional bool accepted_by_admin = 11;
+}
+
+enum PSP {
+  PSP_UNKNOWN = 0;
+
+  PSP_VANDAR_BP_MELLAT = 10;
+  PSP_VANDAR_SEP = 11;
+  PSP_VANDAR = 12;
+
+  PSP_BP_MELLAT = 20;
+}
+
+message Accounting {
+  uint64 id = 1;
+  int64 user_id = 2;
+  int64 balance = 3;
+  auth.v1.UserIdentityBasic user = 4;
+}
+
+message IPGGenTokenPayload {
+  int64 amount = 2;
+  string payer_id = 3;
+  string mobile = 4;
+  string national_id = 5;
+  int64 order_id = 6;
+  string callback_url = 7;
+  repeated string bank_cards = 8;
+}
+
+message IPGLog {
+  string ref_id = 1;
+  Accounting accounting = 2;
+  int64 amount = 4;
+  AccountingStatus status = 5;
+  string created_at = 6;
+  string updated_at = 7;
+  string token = 8;
+  PSP psp = 9;
+  optional int64 transaction_id = 10;
+  optional Transaction transaction = 11;
+}
+
+message IPGLogReq {
+  auth.v1.InternalIAM iam = 1;
+  string ref_id = 2;
+}
+
+message IPGConfirmRes {
+  string ref_id = 1;
+  optional string error = 2;
+}
 
 message SaleManualReq {
   auth.v1.InternalIAM iam = 1;
@@ -634,12 +773,14 @@ message WithdrawIRTReq {
   auth.v1.InternalIAM iam = 1;
   double amount = 2;
   int64 bank_info_id = 3;
+  auth.v1.TFA tfa = 4; 
 }
 
 message WithdrawIRTRes {
-  int64 transaction_id = 1;
+  uint64 id = 1;
   int64 amount = 2;
   string transaction_hash = 3;
+  auth.v1.BankInfo bank_info = 4;
 }
 
 message BuyAssetReq {
@@ -658,7 +799,7 @@ message DeclineBuyContractReq {
 
 message ConfirmBuyAssetReq {
   auth.v1.InternalIAM iam = 1;
-  uint64 agreement_id = 2;      // Only in asset that require agreement contract
+  uint64 agreement_id = 2; // Only in asset that require agreement contract
   optional auth.v1.TFA tfa = 3; // This might be used in the future
 }
 
@@ -684,9 +825,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_MARKET_MAKER = 4;
+  CONTRACT_TYPE_MARKET_TAKER = 5;
 }
 
 // agreement_id

wallet/v1/srv.proto

@@ -9,19 +9,13 @@ import "wallet/v1/msg.proto";
 service WalletService {
   rpc WalletSrvHealth(base.v1.Empty) returns (base.v1.StatusRes);
 
-  // Internal rpc
-  rpc InternalWalletDeleteCache(base.v1.Empty) returns (base.v1.StatusRes);
-  rpc InternalCreateFederation(auth.v1.InternalIAM) returns (base.v1.StatusRes);
-  rpc GetPublicKeyByNationalID(NationalIDReq) returns (PubKeyRes);
-
-  rpc UserGetFederation(auth.v1.InternalIAM) returns (Federation);
-
   rpc GetNetworkList(base.v1.Empty) returns (NetworkList);
 
   rpc GetAssetList(AssetFilter) returns (AssetList);
   rpc GetAsset(GetAssetReq) returns (Asset);
   rpc GetAssetCommissions(base.v1.IdReq) returns (CommissionList);
   rpc GetAssetPrice(base.v1.IdReq) returns (AssetPrice);
+  rpc AssetDiscount(AssetDiscountReq) returns (AssetDiscountRes);
 
   rpc UserInitWallet(UserInitWalletReq) returns (base.v1.StatusRes);
   rpc UserGetWalletList(auth.v1.InternalIAM) returns (WalletList);
@@ -30,12 +24,19 @@ service WalletService {
 
   rpc UserGetTransactionList(TransactionListFilter) returns (TransactionList);
 
+  // Commission Logs
+  rpc GetReferrerCommissionLogsList(auth.v1.InternalIAM) returns (ReferrerCommissionLogsList);
+  rpc GetTotalReferralCommission(TotalReferralCommissionIn) returns (TotalReferralCommissionOut);
+  rpc ClaimReferralCommission(ClaimReferralCommissionIn) returns (base.v1.StatusRes);
+
   // Get Token from IPG is and internal api
   rpc IPGGetToken(IPGGetTokenReq) returns (IPGGetTokenRes);
   // IPG Confirm is a public api
   rpc IPGConfirm(IPGConfirmReq) returns (IPGConfirmRes);
+  rpc GetIPGLog(IPGLogReq) returns (IPGLog);
+
   // Admin can increase user's balance as wish
-  rpc AdminManualSaleDeposit(SaleManualReq) returns (base.v1.StatusRes);
+  // rpc AdminManualSaleDeposit(SaleManualReq) returns (base.v1.StatusRes);
 
   // BNPL
   rpc GetBNPLList(base.v1.Empty) returns (BNPLList);
@@ -54,8 +55,6 @@ service WalletService {
   rpc InternalTransferAsset(TransferAssetReq) returns (TransferAssetRes);
   rpc ExternalTransferAsset(TransferAssetReq) returns (TransferAssetRes);
 
-  rpc AssetDiscount(AssetDiscountReq) returns (AssetDiscountRes);
-
   //  --- IRT ---
   rpc WithdrawIRT(WithdrawIRTReq) returns (WithdrawIRTRes);
   rpc DepositIRT(DepositIRTReq) returns (IPGGetTokenRes);