@arbiwallet/contracts 1.0.212 → 1.0.214

package/gen/exchange_core.ts

@@ -28,94 +28,29 @@ export enum ExchangeDealAction {
   UNRECOGNIZED = -1,
 }
 
-export interface CreateExchangeOrderRequest {
-  inputAmount: number;
-  outputAmount: number;
-  inputCurrency: string;
-  outputCurrency: string;
-  withdrawType: string;
-  customer: string;
-  receiveBank?: string | undefined;
-}
-
-export interface CreateExchangeOrderResponse {
-  success: boolean;
-  statusCode: number;
-  orderId?: string | undefined;
-  message?: string | undefined;
-  warning?: string | undefined;
-  error?: string | undefined;
-  errors: string[];
-}
-
-export interface CreateExchangePaymentRequest {
-  managerUserId?: string | undefined;
-  managerId?: string | undefined;
-  calculationId?: string | undefined;
-  agentId: number;
-  amount?: number | undefined;
-  customerId?: string | undefined;
-  cryptoNetwork?: string | undefined;
-  customerSource?: string | undefined;
-  customerReferrer?: string | undefined;
-}
-
-export interface CreateExchangePaymentResult {
-  paymentId: string;
-  paymentUuid: string;
-  amount: number;
-  status: number;
-  agent: string;
-  walletId?: string | undefined;
-  cryptoNetwork?: string | undefined;
-  cryptoAddress?: string | undefined;
-  arbiLink?: string | undefined;
-  paymentLink?: string | undefined;
-}
-
-export interface CreateExchangePaymentResponse {
-  ok: boolean;
-  result?: CreateExchangePaymentResult | undefined;
-  error?: string | undefined;
-  validationErrors?: { [key: string]: any } | undefined;
-}
-
-export interface HandlePaymentWebhookRequest {
-  jsonPayload: string;
-}
-
-export interface HandlePaymentWebhookResponse {
-  ok: boolean;
-  status: string;
-}
-
-export interface GetExchangePaymentsRequest {
-  page?: number | undefined;
-  limit?: number | undefined;
-}
-
-export interface GetExchangePaymentsItem {
-  paymentId: string;
-  paymentUuid: string;
-  amount: number;
-  status: number;
-  paymentAgentStatus?: string | undefined;
-  paymentLink?: string | undefined;
-  qrLink?: string | undefined;
-  cryptoAddress?: string | undefined;
-}
-
-export interface GetExchangePaymentsResponse {
-  payments: GetExchangePaymentsItem[];
-  page: number;
-  limit: number;
-  total: number;
-  totalPages: number;
+export interface ActorContext {
+  /** users.CustomUser.id */
+  userId: string;
+  /** exchanges_manager.id (если есть) */
+  managerId?:
+    | string
+    | undefined;
+  /** request.user.is_superuser */
+  isSuperuser: boolean;
+  /** имена Django-групп из старого проекта */
+  groupNames: string[];
+  /** офисы менеджера (для office-based checks) */
+  officeIds: string[];
+  /** для аудита/трассировки (по желанию) */
+  requestId?:
+    | string
+    | undefined;
+  /** тип клиента (опционально) */
+  clientType?: string | undefined;
 }
 
 export interface CreateExchangeDealRequest {
-  managerUserId: string;
-  managerId?: string | undefined;
+  actor: ActorContext | undefined;
   calculationId?: string | undefined;
   paymentId?: string | undefined;
   methodId: string;
@@ -127,6 +62,7 @@ export interface CreateExchangeDealRequest {
   inputCurrencyId?: string | undefined;
   outputCurrencyId?: string | undefined;
   customerId?: string | undefined;
+  managerPersonId?: string | undefined;
   expensesForCourier?: number | undefined;
   includeInTotalCalculation?: boolean | undefined;
   oneCurrencyExchange?: boolean | undefined;
@@ -158,32 +94,33 @@ export interface CreateExchangeDealResponse {
 }
 
 export interface GetExchangeDealsRequest {
+  actor: ActorContext | undefined;
   fromDate?: string | undefined;
   toDate?: string | undefined;
-  manager?: number | undefined;
-  customer?: number | undefined;
+  managerId?: string | undefined;
+  customerId?: string | undefined;
   page?: number | undefined;
   pageSize?: number | undefined;
   ordering?: string | undefined;
 }
 
 export interface GetExchangeDealsManager {
-  id: number;
+  id: string;
   email: string;
 }
 
 export interface GetExchangeDealsItem {
-  id: number;
-  customerId: number;
-  paymentId?: number | undefined;
+  id: string;
+  customerId: string;
+  paymentId?: string | undefined;
   inputAmount: number;
-  inputCurrencyId: number;
+  inputCurrencyId: string;
   outputAmount: number;
-  outputCurrencyId: number;
+  outputCurrencyId: string;
   factOutputAmount: number;
   status: boolean;
   exchangeStatusName: string;
-  calculationSourceId?: number | undefined;
+  calculationSourceId?: string | undefined;
   manager?: GetExchangeDealsManager | undefined;
   createdAt: string;
 }
@@ -196,19 +133,20 @@ export interface GetExchangeDealsResponse {
 }
 
 export interface UpdateExchangeDealRequest {
-  id: number;
-  customerId?: number | undefined;
+  actor: ActorContext | undefined;
+  id: string;
+  customerId?: string | undefined;
   inputAmount?: number | undefined;
-  inputCurrencyId?: number | undefined;
-  inputWalletId?: number | undefined;
-  methodId?: number | undefined;
-  outputCurrencyId?: number | undefined;
+  inputCurrencyId?: string | undefined;
+  inputWalletId?: string | undefined;
+  methodId?: string | undefined;
+  outputCurrencyId?: string | undefined;
   outputAmount?: number | undefined;
   factOutputAmount?: number | undefined;
-  outputWalletId?: number | undefined;
-  exchangeStatusId?: number | undefined;
+  outputWalletId?: string | undefined;
+  exchangeStatusId?: string | undefined;
   payed?: boolean | undefined;
-  managerPersonId?: number | undefined;
+  managerPersonId?: string | undefined;
   exchangeRate1Iter?: number | undefined;
   exchangeRate2Iter?: number | undefined;
   usdtRate?: number | undefined;
@@ -217,19 +155,19 @@ export interface UpdateExchangeDealRequest {
   customerDocName?: string | undefined;
   customerDocNationality?: string | undefined;
   customerDocNumber?: string | undefined;
-  priorityManagerId?: number | undefined;
-  priorityOutcomeWalletId?: number | undefined;
+  priorityManagerId?: string | undefined;
+  priorityOutcomeWalletId?: string | undefined;
 }
 
 export interface UpdateExchangeDealResult {
-  id: number;
-  customerId: number;
+  id: string;
+  customerId: string;
   inputAmount: number;
-  inputCurrencyId: number;
+  inputCurrencyId: string;
   outputAmount: number;
-  outputCurrencyId: number;
+  outputCurrencyId: string;
   factOutputAmount: number;
-  exchangeStatusId: number;
+  exchangeStatusId: string;
   payed: boolean;
   includeInTotalCalculation: boolean;
 }
@@ -242,7 +180,8 @@ export interface UpdateExchangeDealResponse {
 }
 
 export interface CompleteExchangeDealRequest {
-  id: number;
+  actor: ActorContext | undefined;
+  id: string;
 }
 
 export interface CompleteExchangeDealResponse {
@@ -252,7 +191,8 @@ export interface CompleteExchangeDealResponse {
 }
 
 export interface CancelExchangeDealRequest {
-  id: number;
+  actor: ActorContext | undefined;
+  id: string;
 }
 
 export interface CancelExchangeDealResponse {
@@ -267,7 +207,7 @@ export interface GetExchangeDealStatesByCalculationIdsRequest {
 
 export interface ExchangeDealStateByCalculation {
   calculationId: string;
-  dealId?: number | undefined;
+  dealId?: string | undefined;
   status: ExchangeDealStatus;
   allowedActions: ExchangeDealAction[];
 }
@@ -278,15 +218,16 @@ export interface GetExchangeDealStatesByCalculationIdsResponse {
 }
 
 export interface GetTransactionsRequest {
+  actor: ActorContext | undefined;
   startDate?: string | undefined;
   endDate?: string | undefined;
-  userId?: number | undefined;
-  currencyId?: number | undefined;
-  walletId?: number | undefined;
+  userId?: string | undefined;
+  currencyId?: string | undefined;
+  walletId?: string | undefined;
   type?: number | undefined;
   accountType?: number | undefined;
-  categoryId?: number | undefined;
-  businessUnitId?: number | undefined;
+  categoryId?: string | undefined;
+  businessUnitId?: string | undefined;
   search?: string | undefined;
   page?: number | undefined;
   pageSize?: number | undefined;
@@ -299,28 +240,28 @@ export interface GetTransactionsSummaryItem {
 }
 
 export interface GetTransactionsItem {
-  id: number;
+  id: string;
   transactionDatetime: string;
   createdAt: string;
   amount: number;
   currency?: string | undefined;
   usdtAmount?: number | undefined;
   status: boolean;
-  walletId?: number | undefined;
+  walletId?: string | undefined;
   walletName?: string | undefined;
-  moveWalletId?: number | undefined;
+  moveWalletId?: string | undefined;
   moveWalletName?: string | undefined;
   type: number;
   typeName?: string | undefined;
-  categoryId?: number | undefined;
+  categoryId?: string | undefined;
   categoryName?: string | undefined;
-  businessUnitId?: number | undefined;
+  businessUnitId?: string | undefined;
   businessUnitName?: string | undefined;
   name: string;
   comment?: string | undefined;
-  exchangeId?: number | undefined;
+  exchangeId?: string | undefined;
   exchangeUrl?: string | undefined;
-  userId?: number | undefined;
+  userId?: string | undefined;
   username?: string | undefined;
   accountType: number;
 }

package/package.json

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

package/proto/exchange_core.proto

@@ -24,95 +24,104 @@ service ExchangeCoreService {
   rpc GetTransactions(GetTransactionsRequest) returns (GetTransactionsResponse);
 }
 
-message CreateExchangeOrderRequest {
-  double input_amount = 1;
-  double output_amount = 2;
-  string input_currency = 3;
-  string output_currency = 4;
-  string withdraw_type = 5;
-  string customer = 6;
-  optional string receive_bank = 7;
-}
-
-message CreateExchangeOrderResponse {
-  bool success = 1;
-  int32 status_code = 2;
-  optional string order_id = 3;
-  optional string message = 4;
-  optional string warning = 5;
-  optional string error = 6;
-  repeated string errors = 7;
-}
-
-message CreateExchangePaymentRequest {
-  optional string manager_user_id = 1;
-  optional string manager_id = 2;
-
-  optional string calculation_id = 3;
-  int32 agent_id = 4;
-  optional double amount = 5;
-  optional string customer_id = 6;
-  optional string crypto_network = 7;
-  optional string customer_source = 8;
-  optional string customer_referrer = 9;
-}
-
-message CreateExchangePaymentResult {
-  string payment_id = 1;
-  string payment_uuid = 2;
-  double amount = 3;
-  int32 status = 4;
-  string agent = 5;
-  optional string wallet_id = 6;
-  optional string crypto_network = 7;
-  optional string crypto_address = 8;
-  optional string arbi_link = 9;
-  optional string payment_link = 10;
-}
-
-message CreateExchangePaymentResponse {
-  bool ok = 1;
-  optional CreateExchangePaymentResult result = 2;
-  optional string error = 3;
-  optional google.protobuf.Struct validationErrors = 4;
-}
-
-message HandlePaymentWebhookRequest {
-  string json_payload = 1;
-}
-
-message HandlePaymentWebhookResponse {
-  bool ok = 1;
-  string status = 2;
-}
-
-message GetExchangePaymentsRequest {
-  optional int32 page = 1;
-  optional int32 limit = 2;
-}
-
-message GetExchangePaymentsItem {
-  string payment_id = 1;
-  string payment_uuid = 2;
-  double amount = 3;
-  int32 status = 4;
-  optional string payment_agent_status = 5;
-  optional string payment_link = 6;
-  optional string qr_link = 7;
-  optional string crypto_address = 8;
-}
-
-message GetExchangePaymentsResponse {
-  repeated GetExchangePaymentsItem payments = 1;
-  int32 page = 2;
-  int32 limit = 3;
-  int32 total = 4;
-  int32 total_pages = 5;
+// message CreateExchangeOrderRequest {
+//   double input_amount = 1;
+//   double output_amount = 2;
+//   string input_currency = 3;
+//   string output_currency = 4;
+//   string withdraw_type = 5;
+//   string customer_id = 6;
+//   optional string receive_bank = 7;
+// }
+
+// message CreateExchangeOrderResponse {
+//   bool success = 1;
+//   int32 status_code = 2;
+//   optional string order_id = 3;
+//   optional string message = 4;
+//   optional string warning = 5;
+//   optional string error = 6;
+//   repeated string errors = 7;
+// }
+
+// message CreateExchangePaymentRequest {
+//   optional string manager_user_id = 1;
+//   optional string manager_id = 2;
+
+//   optional string calculation_id = 3;
+//   int32 agent_id = 4;
+//   optional double amount = 5;
+//   optional string customer_id = 6;
+//   optional string crypto_network = 7;
+//   optional string customer_source = 8;
+//   optional string customer_referrer = 9;
+// }
+
+// message CreateExchangePaymentResult {
+//   string payment_id = 1;
+//   string payment_uuid = 2;
+//   double amount = 3;
+//   int32 status = 4;
+//   string agent = 5;
+//   optional string wallet_id = 6;
+//   optional string crypto_network = 7;
+//   optional string crypto_address = 8;
+//   optional string arbi_link = 9;
+//   optional string payment_link = 10;
+// }
+
+// message CreateExchangePaymentResponse {
+//   bool ok = 1;
+//   optional CreateExchangePaymentResult result = 2;
+//   optional string error = 3;
+//   optional google.protobuf.Struct validationErrors = 4;
+// }
+
+// message HandlePaymentWebhookRequest {
+//   string json_payload = 1;
+// }
+
+// message HandlePaymentWebhookResponse {
+//   bool ok = 1;
+//   string status = 2;
+// }
+
+// message GetExchangePaymentsRequest {
+//   optional int32 page = 1;
+//   optional int32 limit = 2;
+// }
+
+// message GetExchangePaymentsItem {
+//   string payment_id = 1;
+//   string payment_uuid = 2;
+//   double amount = 3;
+//   int32 status = 4;
+//   optional string payment_agent_status = 5;
+//   optional string payment_link = 6;
+//   optional string qr_link = 7;
+//   optional string crypto_address = 8;
+// }
+
+// message GetExchangePaymentsResponse {
+//   repeated GetExchangePaymentsItem payments = 1;
+//   int32 page = 2;
+//   int32 limit = 3;
+//   int32 total = 4;
+//   int32 total_pages = 5;
+// }
+
+message ActorContext {
+  string user_id = 1;                 // users.CustomUser.id
+  optional string manager_id = 2;     // exchanges_manager.id (если есть)
+  bool is_superuser = 3;              // request.user.is_superuser
+  repeated string group_names = 4;    // имена Django-групп из старого проекта
+  repeated string office_ids = 5;     // офисы менеджера (для office-based checks)
+  optional string request_id = 6;     // для аудита/трассировки (по желанию)
+  optional string client_type = 7;    // тип клиента (опционально)
 }
 
 message CreateExchangeDealRequest {
-  string manager_user_id = 1;
-  optional string manager_id = 2;
+  ActorContext actor = 1;
 
   optional string calculation_id = 3;
   optional string payment_id = 4;
@@ -129,19 +138,20 @@ message CreateExchangeDealRequest {
   optional string output_currency_id = 12;
 
   optional string customer_id = 13;
+  optional string manager_person_id = 14;
 
-  optional double expenses_for_courier = 14;
-  optional bool include_in_total_calculation = 15;
-  optional bool one_currency_exchange = 16;
-  optional bool received_from_dealer = 17;
-  optional string received_from_dealer_wallet_id = 18;
+  optional double expenses_for_courier = 15;
+  optional bool include_in_total_calculation = 16;
+  optional bool one_currency_exchange = 17;
+  optional bool received_from_dealer = 18;
+  optional string received_from_dealer_wallet_id = 19;
 
-  optional string customer_doc_name = 19;
-  optional string customer_doc_nationality = 20;
-  optional string customer_doc_number = 21;
+  optional string customer_doc_name = 20;
+  optional string customer_doc_nationality = 21;
+  optional string customer_doc_number = 22;
 
-  optional string customer_source = 22;
-  optional string customer_referrer = 23;
+  optional string customer_source = 23;
+  optional string customer_referrer = 24;
 
   repeated double receipts = 25;
 }
@@ -164,32 +174,33 @@ message CreateExchangeDealResponse {
 }
 
 message GetExchangeDealsRequest {
-  optional string from_date = 1;
-  optional string to_date = 2;
-  optional int32 manager = 3;
-  optional int32 customer = 4;
-  optional int32 page = 5;
-  optional int32 page_size = 6;
-  optional string ordering = 7;
+  ActorContext actor = 1;
+  optional string from_date = 2;
+  optional string to_date = 3;
+  optional string manager_id = 4;
+  optional string customer_id = 5;
+  optional int32 page = 6;
+  optional int32 page_size = 7;
+  optional string ordering = 8;
 }
 
 message GetExchangeDealsManager {
-  int32 id = 1;
+  string id = 1;
   string email = 2;
 }
 
 message GetExchangeDealsItem {
-  int32 id = 1;
-  int32 customer_id = 2;
-  optional int32 payment_id = 3;
+  string id = 1;
+  string customer_id = 2;
+  optional string payment_id = 3;
   double input_amount = 4;
-  int32 input_currency_id = 5;
+  string input_currency_id = 5;
   double output_amount = 6;
-  int32 output_currency_id = 7;
+  string output_currency_id = 7;
   double fact_output_amount = 8;
   bool status = 9;
   string exchange_status_name = 10;
-  optional int32 calculation_source_id = 11;
+  optional string calculation_source_id = 11;
   optional GetExchangeDealsManager manager = 12;
   string created_at = 13;
 }
@@ -202,42 +213,43 @@ message GetExchangeDealsResponse {
 }
 
 message UpdateExchangeDealRequest {
-  int32 id = 1;
-
-  optional int32 customer_id = 2;
-  optional double input_amount = 3;
-  optional int32 input_currency_id = 4;
-  optional int32 input_wallet_id = 5;
-  optional int32 method_id = 6;
-  optional int32 output_currency_id = 7;
-  optional double output_amount = 8;
-  optional double fact_output_amount = 9;
-  optional int32 output_wallet_id = 10;
-  optional int32 exchange_status_id = 11;
-  optional bool payed = 12;
-  optional int32 manager_person_id = 13;
-  optional double exchange_rate_1_iter = 14;
-  optional double exchange_rate_2_iter = 15;
-  optional double usdt_rate = 16;
-  optional bool include_in_total_calculation = 17;
-
-  repeated double receipts = 18;
-  optional string customer_doc_name = 19;
-  optional string customer_doc_nationality = 20;
-  optional string customer_doc_number = 21;
-  optional int32 priority_manager_id = 22;
-  optional int32 priority_outcome_wallet_id = 23;
+  ActorContext actor = 1;
+  string id = 2;
+
+  optional string customer_id = 3;
+  optional double input_amount = 4;
+  optional string input_currency_id = 5;
+  optional string input_wallet_id = 6;
+  optional string method_id = 7;
+  optional string output_currency_id = 8;
+  optional double output_amount = 9;
+  optional double fact_output_amount = 10;
+  optional string output_wallet_id = 11;
+  optional string exchange_status_id = 12;
+  optional bool payed = 13;
+  optional string manager_person_id = 14;
+  optional double exchange_rate_1_iter = 15;
+  optional double exchange_rate_2_iter = 16;
+  optional double usdt_rate = 17;
+  optional bool include_in_total_calculation = 18;
+
+  repeated double receipts = 19;
+  optional string customer_doc_name = 20;
+  optional string customer_doc_nationality = 21;
+  optional string customer_doc_number = 22;
+  optional string priority_manager_id = 23;
+  optional string priority_outcome_wallet_id = 24;
 }
 
 message UpdateExchangeDealResult {
-  int32 id = 1;
-  int32 customer_id = 2;
+  string id = 1;
+  string customer_id = 2;
   double input_amount = 3;
-  int32 input_currency_id = 4;
+  string input_currency_id = 4;
   double output_amount = 5;
-  int32 output_currency_id = 6;
+  string output_currency_id = 6;
   double fact_output_amount = 7;
-  int32 exchange_status_id = 8;
+  string exchange_status_id = 8;
   bool payed = 9;
   bool include_in_total_calculation = 10;
 }
@@ -250,7 +262,8 @@ message UpdateExchangeDealResponse {
 }
 
 message CompleteExchangeDealRequest {
-  int32 id = 1;
+  ActorContext actor = 1;
+  string id = 2;
 }
 
 message CompleteExchangeDealResponse {
@@ -260,7 +273,8 @@ message CompleteExchangeDealResponse {
 }
 
 message CancelExchangeDealRequest {
-  int32 id = 1;
+  ActorContext actor = 1;
+  string id = 2;
 }
 
 message CancelExchangeDealResponse {
@@ -289,7 +303,7 @@ enum ExchangeDealAction {
 
 message ExchangeDealStateByCalculation {
   string calculation_id = 1;
-  optional int32 deal_id = 2;
+  optional string deal_id = 2;
   ExchangeDealStatus status = 3;
   repeated ExchangeDealAction allowed_actions = 4;
 }
@@ -300,18 +314,19 @@ message GetExchangeDealStatesByCalculationIdsResponse {
 }
 
 message GetTransactionsRequest {
-  optional string start_date = 1;
-  optional string end_date = 2;
-  optional int32 user_id = 3;
-  optional int32 currency_id = 4;
-  optional int32 wallet_id = 5;
-  optional int32 type = 6;
-  optional int32 account_type = 7;
-  optional int32 category_id = 8;
-  optional int32 business_unit_id = 9;
-  optional string search = 10;
-  optional int32 page = 11;
-  optional int32 page_size = 12;
+  ActorContext actor = 1;
+  optional string start_date = 2;
+  optional string end_date = 3;
+  optional string user_id = 4;
+  optional string currency_id = 5;
+  optional string wallet_id = 6;
+  optional int32 type = 7;
+  optional int32 account_type = 8;
+  optional string category_id = 9;
+  optional string business_unit_id = 10;
+  optional string search = 11;
+  optional int32 page = 12;
+  optional int32 page_size = 13;
 }
 
 message GetTransactionsSummaryItem {
@@ -321,28 +336,28 @@ message GetTransactionsSummaryItem {
 }
 
 message GetTransactionsItem {
-  int32 id = 1;
+  string id = 1;
   string transaction_datetime = 2;
   string created_at = 3;
   double amount = 4;
   optional string currency = 5;
   optional double usdt_amount = 6;
   bool status = 7;
-  optional int32 wallet_id = 8;
+  optional string wallet_id = 8;
   optional string wallet_name = 9;
-  optional int32 move_wallet_id = 10;
+  optional string move_wallet_id = 10;
   optional string move_wallet_name = 11;
   int32 type = 12;
   optional string type_name = 13;
-  optional int32 category_id = 14;
+  optional string category_id = 14;
   optional string category_name = 15;
-  optional int32 business_unit_id = 16;
+  optional string business_unit_id = 16;
   optional string business_unit_name = 17;
   string name = 18;
   optional string comment = 19;
-  optional int32 exchange_id = 20;
+  optional string exchange_id = 20;
   optional string exchange_url = 21;
-  optional int32 user_id = 22;
+  optional string user_id = 22;
   optional string username = 23;
   int32 account_type = 24;
 }