@arbiwallet/contracts 1.0.265 → 1.0.267

package/gen/exchange_core.ts

@@ -168,6 +168,15 @@ export interface GetExchangeDealsItem {
   outputAmountInUsdt?: number | undefined;
   includeInTotalCalculation: boolean;
   oneCurrencyExchange: boolean;
+  profitPercent?: number | undefined;
+  profit?: number | undefined;
+  profitCurrencyId?: string | undefined;
+  usdtProfit?: number | undefined;
+  expensesForCourier?: number | undefined;
+  referrerBonusAmount?: number | undefined;
+  referrerPercent?: number | undefined;
+  managerPersonId?: string | undefined;
+  managerPersonName?: string | undefined;
 }
 
 export interface GetExchangeDealsResponse {

package/gen/referral.ts

@@ -138,6 +138,20 @@ export interface BatchGetDirectReferrersByUserIdsResponse {
   directReferrerIds: number[];
 }
 
+export interface BatchGetExchangeReferralSummariesRequest {
+  exchangeIds: string[];
+}
+
+export interface ExchangeReferralSummary {
+  exchangeId: string;
+  amount: string;
+  percent: string;
+}
+
+export interface BatchGetExchangeReferralSummariesResponse {
+  summaries: ExchangeReferralSummary[];
+}
+
 export interface ApplyExchangeCompletedRequest {
   exchangeId: string;
   walletUserId: string;
@@ -273,6 +287,10 @@ export interface ReferralServiceClient {
     request: BatchGetDirectReferrersByUserIdsRequest,
   ): Observable<BatchGetDirectReferrersByUserIdsResponse>;
 
+  batchGetExchangeReferralSummaries(
+    request: BatchGetExchangeReferralSummariesRequest,
+  ): Observable<BatchGetExchangeReferralSummariesResponse>;
+
   applyExchangeCompleted(request: ApplyExchangeCompletedRequest): Observable<ApplyExchangeCompletedResponse>;
 
   applyExchangeCancelled(request: ApplyExchangeCancelledRequest): Observable<ApplyExchangeCancelledResponse>;
@@ -325,6 +343,13 @@ export interface ReferralServiceController {
     | Observable<BatchGetDirectReferrersByUserIdsResponse>
     | BatchGetDirectReferrersByUserIdsResponse;
 
+  batchGetExchangeReferralSummaries(
+    request: BatchGetExchangeReferralSummariesRequest,
+  ):
+    | Promise<BatchGetExchangeReferralSummariesResponse>
+    | Observable<BatchGetExchangeReferralSummariesResponse>
+    | BatchGetExchangeReferralSummariesResponse;
+
   applyExchangeCompleted(
     request: ApplyExchangeCompletedRequest,
   ):
@@ -373,6 +398,7 @@ export function ReferralServiceControllerMethods() {
       "listReferrals",
       "getReferredUserIds",
       "batchGetDirectReferrersByUserIds",
+      "batchGetExchangeReferralSummaries",
       "applyExchangeCompleted",
       "applyExchangeCancelled",
       "listCommissions",

package/gen/user.ts

@@ -431,6 +431,7 @@ export interface BatchGetUserIdsBySearchResponse {
 }
 
 export interface SearchUserRequest {
+  /** Строка поиска по полям: telegram_username, email, phone, whatsapp. */
   search: string;
   /** По умолчанию 50, максимум 50. */
   limit: number;
@@ -444,6 +445,7 @@ export interface SearchUserItem {
   email?: string | undefined;
   phone?: string | undefined;
   telegramUsername?: string | undefined;
+  whatsapp?: string | undefined;
 }
 
 export interface SearchUserResponse {
@@ -611,11 +613,11 @@ export interface UserServiceClient {
 
   verifyChangePhoneCode(request: VerifyChangePhoneCodeRequest): Observable<UserResponse>;
 
-  /** Батч-поиск пользователей по строке: возвращает только id (с защитой от слишком широкого поиска). */
+  /** Батч-поиск пользователей по строке (telegram_username, email, phone, whatsapp): возвращает только id. */
 
   batchGetUserIdsBySearch(request: BatchGetUserIdsBySearchRequest): Observable<BatchGetUserIdsBySearchResponse>;
 
-  /** Поиск пользователей по строке: возвращает до 50 совпадений с полями, по которым ведется поиск. */
+  /** Поиск пользователей по строке (telegram_username, email, phone, whatsapp): возвращает до 50 совпадений. */
 
   searchUser(request: SearchUserRequest): Observable<SearchUserResponse>;
 
@@ -827,7 +829,7 @@ export interface UserServiceController {
     request: VerifyChangePhoneCodeRequest,
   ): Promise<UserResponse> | Observable<UserResponse> | UserResponse;
 
-  /** Батч-поиск пользователей по строке: возвращает только id (с защитой от слишком широкого поиска). */
+  /** Батч-поиск пользователей по строке (telegram_username, email, phone, whatsapp): возвращает только id. */
 
   batchGetUserIdsBySearch(
     request: BatchGetUserIdsBySearchRequest,
@@ -836,7 +838,7 @@ export interface UserServiceController {
     | Observable<BatchGetUserIdsBySearchResponse>
     | BatchGetUserIdsBySearchResponse;
 
-  /** Поиск пользователей по строке: возвращает до 50 совпадений с полями, по которым ведется поиск. */
+  /** Поиск пользователей по строке (telegram_username, email, phone, whatsapp): возвращает до 50 совпадений. */
 
   searchUser(
     request: SearchUserRequest,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@arbiwallet/contracts",
   "descriptions": "Generate and manage smart contracts for ArbiWallet",
-  "version": "1.0.265",
+  "version": "1.0.267",
   "scripts": {
     "generate": "protoc -I ./proto ./proto/*.proto --ts_proto_out=./gen --ts_proto_opt=nestJs=true,package=omit"
   },

package/proto/exchange_core.proto

@@ -200,6 +200,15 @@ message GetExchangeDealsItem {
   optional double output_amount_in_usdt = 30;
   bool include_in_total_calculation = 31;
   bool one_currency_exchange = 32;
+  optional double profit_percent = 33;
+  optional double profit = 34;
+  optional string profit_currency_id = 35;
+  optional double usdt_profit = 36;
+  optional double expenses_for_courier = 37;
+  optional double referrer_bonus_amount = 38;
+  optional double referrer_percent = 39;
+  optional string manager_person_id = 40;
+  optional string manager_person_name = 41;
 }
 
 message GetExchangeDealsResponse {

package/proto/referral.proto

@@ -12,6 +12,7 @@ service ReferralService {
   rpc ListReferrals(ListReferralsRequest) returns (ListReferralsResponse);
   rpc GetReferredUserIds(GetReferredUserIdsRequest) returns (GetReferredUserIdsResponse);
   rpc BatchGetDirectReferrersByUserIds(BatchGetDirectReferrersByUserIdsRequest) returns (BatchGetDirectReferrersByUserIdsResponse);
+  rpc BatchGetExchangeReferralSummaries(BatchGetExchangeReferralSummariesRequest) returns (BatchGetExchangeReferralSummariesResponse);
   rpc ApplyExchangeCompleted(ApplyExchangeCompletedRequest) returns (ApplyExchangeCompletedResponse);
   rpc ApplyExchangeCancelled(ApplyExchangeCancelledRequest) returns (ApplyExchangeCancelledResponse);
   rpc ListCommissions(ListCommissionsRequest) returns (ListCommissionsResponse);
@@ -145,6 +146,20 @@ message BatchGetDirectReferrersByUserIdsResponse {
   repeated int32 direct_referrer_ids = 1;
 }
 
+message BatchGetExchangeReferralSummariesRequest {
+  repeated string exchange_ids = 1;
+}
+
+message ExchangeReferralSummary {
+  string exchange_id = 1;
+  string amount = 2;
+  string percent = 3;
+}
+
+message BatchGetExchangeReferralSummariesResponse {
+  repeated ExchangeReferralSummary summaries = 1;
+}
+
 message ApplyExchangeCompletedRequest {
   string exchange_id = 1;
   string wallet_user_id = 2;

package/proto/user.proto

@@ -53,9 +53,9 @@ service UserService {
   // Смена phone: отправка SMS-кода через Twilio.
   rpc RequestChangePhoneCode (RequestChangePhoneCodeRequest) returns (ContactChangeMessageResponse);
   rpc VerifyChangePhoneCode (VerifyChangePhoneCodeRequest) returns (UserResponse);
-  // Батч-поиск пользователей по строке: возвращает только id (с защитой от слишком широкого поиска).
+  // Батч-поиск пользователей по строке (telegram_username, email, phone, whatsapp): возвращает только id.
   rpc BatchGetUserIdsBySearch (BatchGetUserIdsBySearchRequest) returns (BatchGetUserIdsBySearchResponse);
-  // Поиск пользователей по строке: возвращает до 50 совпадений с полями, по которым ведется поиск.
+  // Поиск пользователей по строке (telegram_username, email, phone, whatsapp): возвращает до 50 совпадений.
   rpc SearchUser (SearchUserRequest) returns (SearchUserResponse);
   // Прелоад выбранного пользователя по id для поиска пользователей: возвращает один элемент.
   rpc PrealoadUserForSearch (PrealoadUserForSearchRequest) returns (PrealoadUserForSearchResponse);
@@ -477,6 +477,7 @@ message BatchGetUserIdsBySearchResponse {
 }
 
 message SearchUserRequest {
+  // Строка поиска по полям: telegram_username, email, phone, whatsapp.
   string search = 1;
   // По умолчанию 50, максимум 50.
   int32 limit = 2;
@@ -490,6 +491,7 @@ message SearchUserItem {
   optional string email = 5;
   optional string phone = 6;
   optional string telegram_username = 7;
+  optional string whatsapp = 8;
 }
 
 message SearchUserResponse {