@arbiwallet/contracts 1.0.224 → 1.0.226

package/gen/crm_manager.ts

@@ -61,6 +61,28 @@ export interface ListManagersResponse {
   pages: number;
 }
 
+export interface BatchGetManagersByIdsRequest {
+  ids: string[];
+}
+
+export interface BatchGetManagersByIdsResponseRecord {
+  id: string;
+  email: string;
+  username: string;
+  firstName: string;
+  lastName: string;
+  displayName: string;
+  avatarUrl: string;
+  status: CrmManagerRecordStatus;
+  createdAtUnixMs: number;
+  updatedAtUnixMs: number;
+  sectionPermissions: SectionPermission[];
+}
+
+export interface BatchGetManagersByIdsResponse {
+  managers: BatchGetManagersByIdsResponseRecord[];
+}
+
 export interface GetManagerRequest {
   managerId: string;
 }
@@ -219,6 +241,8 @@ export const CRM_MANAGER_PACKAGE_NAME = "crm_manager";
 export interface CrmManagerAdminServiceClient {
   listManagers(request: ListManagersRequest): Observable<ListManagersResponse>;
 
+  batchGetManagersByIds(request: BatchGetManagersByIdsRequest): Observable<BatchGetManagersByIdsResponse>;
+
   getManager(request: GetManagerRequest): Observable<GetManagerResponse>;
 
   createManager(request: CreateManagerRequest): Observable<CreateManagerResponse>;
@@ -243,6 +267,10 @@ export interface CrmManagerAdminServiceController {
     request: ListManagersRequest,
   ): Promise<ListManagersResponse> | Observable<ListManagersResponse> | ListManagersResponse;
 
+  batchGetManagersByIds(
+    request: BatchGetManagersByIdsRequest,
+  ): Promise<BatchGetManagersByIdsResponse> | Observable<BatchGetManagersByIdsResponse> | BatchGetManagersByIdsResponse;
+
   getManager(
     request: GetManagerRequest,
   ): Promise<GetManagerResponse> | Observable<GetManagerResponse> | GetManagerResponse;
@@ -282,6 +310,7 @@ export function CrmManagerAdminServiceControllerMethods() {
   return function (constructor: Function) {
     const grpcMethods: string[] = [
       "listManagers",
+      "batchGetManagersByIds",
       "getManager",
       "createManager",
       "updateManager",

package/gen/exchange_core.ts

@@ -12,22 +12,6 @@ import { Struct } from "./google/protobuf/struct";
 
 export const protobufPackage = "exchange_core";
 
-export enum ExchangeDealStatus {
-  EXCHANGE_DEAL_STATUS_UNSPECIFIED = 0,
-  EXCHANGE_DEAL_STATUS_NO_DEAL = 1,
-  EXCHANGE_DEAL_STATUS_IN_PROGRESS = 2,
-  EXCHANGE_DEAL_STATUS_COMPLETED = 3,
-  EXCHANGE_DEAL_STATUS_CANCELLED = 4,
-  UNRECOGNIZED = -1,
-}
-
-export enum ExchangeDealAction {
-  EXCHANGE_DEAL_ACTION_UNSPECIFIED = 0,
-  EXCHANGE_DEAL_ACTION_CREATE_DEAL = 1,
-  EXCHANGE_DEAL_ACTION_OPEN_DEAL = 2,
-  UNRECOGNIZED = -1,
-}
-
 export interface AuthManagerContext {
   managerId: string;
   officeIds: string[];
@@ -48,7 +32,7 @@ export interface CreateExchangeDealRequest {
   factOutputAmount?: number | undefined;
   inputCurrencyId?: string | undefined;
   outputCurrencyId?: string | undefined;
-  customerId?: string | undefined;
+  userId?: string | undefined;
   managerPersonId?: string | undefined;
   expensesForCourier?: number | undefined;
   includeInTotalCalculation?: boolean | undefined;
@@ -65,7 +49,7 @@ export interface CreateExchangeDealRequest {
 
 export interface CreateExchangeDealResult {
   exchangeId: string;
-  customerId: string;
+  userId: string;
   inputAmount: number;
   inputCurrencyId: string;
   outputAmount: number;
@@ -85,7 +69,7 @@ export interface GetExchangeDealsRequest {
   fromDate?: string | undefined;
   toDate?: string | undefined;
   managerId?: string | undefined;
-  customerId?: string | undefined;
+  userId?: string | undefined;
   page?: number | undefined;
   pageSize?: number | undefined;
   ordering?: string | undefined;
@@ -98,7 +82,7 @@ export interface GetExchangeDealsManager {
 
 export interface GetExchangeDealsItem {
   id: string;
-  customerId: string;
+  userId: string;
   paymentId?: string | undefined;
   inputAmount: number;
   inputCurrencyId: string;
@@ -122,7 +106,7 @@ export interface GetExchangeDealsResponse {
 export interface UpdateExchangeDealRequest {
   authManagerContext: AuthManagerContext | undefined;
   id: string;
-  customerId?: string | undefined;
+  userId?: string | undefined;
   inputAmount?: number | undefined;
   inputCurrencyId?: string | undefined;
   inputWalletId?: string | undefined;
@@ -148,7 +132,7 @@ export interface UpdateExchangeDealRequest {
 
 export interface UpdateExchangeDealResult {
   id: string;
-  customerId: string;
+  userId: string;
   inputAmount: number;
   inputCurrencyId: string;
   outputAmount: number;
@@ -234,8 +218,8 @@ export interface GetTransactionsItem {
   comment?: string | undefined;
   exchangeId?: string | undefined;
   exchangeUrl?: string | undefined;
-  userId?: string | undefined;
-  username?: string | undefined;
+  managerId?: string | undefined;
+  managerName?: string | undefined;
   accountType: number;
 }
 
@@ -247,71 +231,6 @@ export interface GetTransactionsResponse {
   summary: GetTransactionsSummaryItem[];
 }
 
-export interface GetExchangeDealHistoryStatisticsRequest {
-  dateFrom?: string | undefined;
-  dateTo?: string | undefined;
-  amountFrom?: number | undefined;
-  amountTo?: number | undefined;
-  inputCurrency?: string | undefined;
-  outputCurrency?:
-    | string
-    | undefined;
-  /** no_payment | with_payment | with_exchange | completed */
-  status?: string | undefined;
-  search?: string | undefined;
-  page?: number | undefined;
-  pageSize?: number | undefined;
-}
-
-export interface GetExchangeDealHistoryStatisticsResponse {
-  items: ExchangeDealStateByCalculation[];
-}
-
-export interface GetExchangePaymentRefsByCalculationIdsRequest {
-  calculationIds: string[];
-}
-
-export interface ExchangePaymentRefByCalculation {
-  calculationId: string;
-  paymentUuid: string;
-}
-
-export interface GetExchangePaymentRefsByCalculationIdsResponse {
-  items: ExchangePaymentRefByCalculation[];
-  notFoundCalculationIds: string[];
-}
-
-export interface GetExchangeDealRefsByCalculationIdsRequest {
-  calculationIds: string[];
-}
-
-export interface ExchangeDealRefByCalculation {
-  calculationId: string;
-  exchangeId: string;
-  status: boolean;
-}
-
-export interface GetExchangeDealRefsByCalculationIdsResponse {
-  items: ExchangeDealRefByCalculation[];
-  notFoundCalculationIds: string[];
-}
-
-export interface GetExchangeDealStatesByCalculationIdsRequest {
-  calculationIds: string[];
-}
-
-export interface ExchangeDealStateByCalculation {
-  calculationId: string;
-  dealId?: string | undefined;
-  status: ExchangeDealStatus;
-  allowedActions: ExchangeDealAction[];
-}
-
-export interface GetExchangeDealStatesByCalculationIdsResponse {
-  items: ExchangeDealStateByCalculation[];
-  notFoundCalculationIds: string[];
-}
-
 export const EXCHANGE_CORE_PACKAGE_NAME = "exchange_core";
 
 wrappers[".google.protobuf.Struct"] = { fromObject: Struct.wrap, toObject: Struct.unwrap } as any;
@@ -334,22 +253,6 @@ export interface ExchangeCoreServiceClient {
   cancelExchangeDeal(request: CancelExchangeDealRequest): Observable<CancelExchangeDealResponse>;
 
   getTransactions(request: GetTransactionsRequest): Observable<GetTransactionsResponse>;
-
-  getExchangeDealHistoryStatistics(
-    request: GetExchangeDealHistoryStatisticsRequest,
-  ): Observable<GetExchangeDealHistoryStatisticsResponse>;
-
-  getExchangePaymentRefsByCalculationIds(
-    request: GetExchangePaymentRefsByCalculationIdsRequest,
-  ): Observable<GetExchangePaymentRefsByCalculationIdsResponse>;
-
-  getExchangeDealRefsByCalculationIds(
-    request: GetExchangeDealRefsByCalculationIdsRequest,
-  ): Observable<GetExchangeDealRefsByCalculationIdsResponse>;
-
-  getExchangeDealStatesByCalculationIds(
-    request: GetExchangeDealStatesByCalculationIdsRequest,
-  ): Observable<GetExchangeDealStatesByCalculationIdsResponse>;
 }
 
 /**
@@ -382,34 +285,6 @@ export interface ExchangeCoreServiceController {
   getTransactions(
     request: GetTransactionsRequest,
   ): Promise<GetTransactionsResponse> | Observable<GetTransactionsResponse> | GetTransactionsResponse;
-
-  getExchangeDealHistoryStatistics(
-    request: GetExchangeDealHistoryStatisticsRequest,
-  ):
-    | Promise<GetExchangeDealHistoryStatisticsResponse>
-    | Observable<GetExchangeDealHistoryStatisticsResponse>
-    | GetExchangeDealHistoryStatisticsResponse;
-
-  getExchangePaymentRefsByCalculationIds(
-    request: GetExchangePaymentRefsByCalculationIdsRequest,
-  ):
-    | Promise<GetExchangePaymentRefsByCalculationIdsResponse>
-    | Observable<GetExchangePaymentRefsByCalculationIdsResponse>
-    | GetExchangePaymentRefsByCalculationIdsResponse;
-
-  getExchangeDealRefsByCalculationIds(
-    request: GetExchangeDealRefsByCalculationIdsRequest,
-  ):
-    | Promise<GetExchangeDealRefsByCalculationIdsResponse>
-    | Observable<GetExchangeDealRefsByCalculationIdsResponse>
-    | GetExchangeDealRefsByCalculationIdsResponse;
-
-  getExchangeDealStatesByCalculationIds(
-    request: GetExchangeDealStatesByCalculationIdsRequest,
-  ):
-    | Promise<GetExchangeDealStatesByCalculationIdsResponse>
-    | Observable<GetExchangeDealStatesByCalculationIdsResponse>
-    | GetExchangeDealStatesByCalculationIdsResponse;
 }
 
 export function ExchangeCoreServiceControllerMethods() {
@@ -421,10 +296,6 @@ export function ExchangeCoreServiceControllerMethods() {
       "completeExchangeDeal",
       "cancelExchangeDeal",
       "getTransactions",
-      "getExchangeDealHistoryStatistics",
-      "getExchangePaymentRefsByCalculationIds",
-      "getExchangeDealRefsByCalculationIds",
-      "getExchangeDealStatesByCalculationIds",
     ];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);

package/gen/user.ts

@@ -346,6 +346,38 @@ export interface ContactChangeMessageResponse {
   message: string;
 }
 
+export interface BatchGetUserIdsBySearchRequest {
+  search: string;
+  /** Максимум возвращаемых id; сервис может дополнительно ограничить. */
+  limit: number;
+}
+
+export interface BatchGetUserIdsBySearchResponse {
+  userIds: number[];
+  /** true, если совпадений больше, чем limit (результат был обрезан). */
+  tooManyMatches: boolean;
+  totalMatches: number;
+}
+
+export interface BatchGetUsersByIdsRequest {
+  userIds: number[];
+}
+
+export interface BatchUserPublicItem {
+  id: number;
+  uid: number;
+  firstName?: string | undefined;
+  lastName?: string | undefined;
+  avatar?: string | undefined;
+  telegramUsername?: string | undefined;
+  status: UserStatus;
+  crmCustomerId?: number | undefined;
+}
+
+export interface BatchGetUsersByIdsResponse {
+  items: BatchUserPublicItem[];
+}
+
 export interface UserBalance {
   asset: string;
   network: string;
@@ -461,6 +493,14 @@ export interface UserServiceClient {
   requestChangePhoneCode(request: RequestChangePhoneCodeRequest): Observable<ContactChangeMessageResponse>;
 
   verifyChangePhoneCode(request: VerifyChangePhoneCodeRequest): Observable<UserResponse>;
+
+  /** Батч-поиск пользователей по строке: возвращает только id (с защитой от слишком широкого поиска). */
+
+  batchGetUserIdsBySearch(request: BatchGetUserIdsBySearchRequest): Observable<BatchGetUserIdsBySearchResponse>;
+
+  /** Батч-получение публичных данных пользователей по списку id (для enrichment в других сервисах). */
+
+  batchGetUsersByIds(request: BatchGetUsersByIdsRequest): Observable<BatchGetUsersByIdsResponse>;
 }
 
 export interface UserServiceController {
@@ -625,6 +665,21 @@ export interface UserServiceController {
   verifyChangePhoneCode(
     request: VerifyChangePhoneCodeRequest,
   ): Promise<UserResponse> | Observable<UserResponse> | UserResponse;
+
+  /** Батч-поиск пользователей по строке: возвращает только id (с защитой от слишком широкого поиска). */
+
+  batchGetUserIdsBySearch(
+    request: BatchGetUserIdsBySearchRequest,
+  ):
+    | Promise<BatchGetUserIdsBySearchResponse>
+    | Observable<BatchGetUserIdsBySearchResponse>
+    | BatchGetUserIdsBySearchResponse;
+
+  /** Батч-получение публичных данных пользователей по списку id (для enrichment в других сервисах). */
+
+  batchGetUsersByIds(
+    request: BatchGetUsersByIdsRequest,
+  ): Promise<BatchGetUsersByIdsResponse> | Observable<BatchGetUsersByIdsResponse> | BatchGetUsersByIdsResponse;
 }
 
 export function UserServiceControllerMethods() {
@@ -655,6 +710,8 @@ export function UserServiceControllerMethods() {
       "verifyChangeEmailCode",
       "requestChangePhoneCode",
       "verifyChangePhoneCode",
+      "batchGetUserIdsBySearch",
+      "batchGetUsersByIds",
     ];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);

package/package.json

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

package/proto/crm_manager.proto

@@ -3,6 +3,7 @@ package crm_manager;
 
 service CrmManagerAdminService {
   rpc ListManagers (ListManagersRequest) returns (ListManagersResponse);
+  rpc BatchGetManagersByIds (BatchGetManagersByIdsRequest) returns (BatchGetManagersByIdsResponse);
   rpc GetManager (GetManagerRequest) returns (GetManagerResponse);
   rpc CreateManager (CreateManagerRequest) returns (CreateManagerResponse);
   rpc UpdateManager (UpdateManagerRequest) returns (UpdateManagerResponse);
@@ -64,6 +65,28 @@ message ListManagersResponse {
   int32 pages = 5;
 }
 
+message BatchGetManagersByIdsRequest {
+  repeated string ids = 1;
+}
+
+message BatchGetManagersByIdsResponseRecord {
+  string id = 1;
+  string email = 2;
+  string username = 3;
+  string first_name = 4;
+  string last_name = 5;
+  string display_name = 6;
+  string avatar_url = 7;
+  CrmManagerRecordStatus status = 8;
+  int64 created_at_unix_ms = 9;
+  int64 updated_at_unix_ms = 10;
+  repeated SectionPermission section_permissions = 11;
+}
+
+message BatchGetManagersByIdsResponse {
+  repeated BatchGetManagersByIdsResponseRecord managers = 1;
+}
+
 message GetManagerRequest {
   string manager_id = 1;
 }

package/proto/exchange_core.proto

@@ -20,13 +20,6 @@ service ExchangeCoreService {
   rpc CancelExchangeDeal(CancelExchangeDealRequest) returns (CancelExchangeDealResponse);
 
   rpc GetTransactions(GetTransactionsRequest) returns (GetTransactionsResponse);
-
-  rpc GetExchangeDealHistoryStatistics(GetExchangeDealHistoryStatisticsRequest) returns (GetExchangeDealHistoryStatisticsResponse);
-
-  
-  rpc GetExchangePaymentRefsByCalculationIds(GetExchangePaymentRefsByCalculationIdsRequest) returns (GetExchangePaymentRefsByCalculationIdsResponse);
-  rpc GetExchangeDealRefsByCalculationIds(GetExchangeDealRefsByCalculationIdsRequest) returns (GetExchangeDealRefsByCalculationIdsResponse);
-  rpc GetExchangeDealStatesByCalculationIds(GetExchangeDealStatesByCalculationIdsRequest) returns (GetExchangeDealStatesByCalculationIdsResponse);
 }
 
 // message CreateExchangePaymentRequest {
@@ -36,7 +29,7 @@ service ExchangeCoreService {
 //   optional string calculation_id = 3;
 //   int32 agent_id = 4;
 //   optional double amount = 5;
-//   optional string customer_id = 6;
+//   optional string user_id = 6;
 //   optional string crypto_network = 7;
 //   optional string customer_source = 8;
 //   optional string customer_referrer = 9;
@@ -120,7 +113,7 @@ message CreateExchangeDealRequest {
   optional string input_currency_id = 11;
   optional string output_currency_id = 12;
 
-  optional string customer_id = 13;
+  optional string user_id = 13;
   optional string manager_person_id = 14;
 
   optional double expenses_for_courier = 15;
@@ -141,7 +134,7 @@ message CreateExchangeDealRequest {
 
 message CreateExchangeDealResult {
   string exchange_id = 1;
-  string customer_id = 2;
+  string user_id = 2;
   double input_amount = 3;
   string input_currency_id = 4;
   double output_amount = 5;
@@ -161,7 +154,7 @@ message GetExchangeDealsRequest {
   optional string from_date = 2;
   optional string to_date = 3;
   optional string manager_id = 4;
-  optional string customer_id = 5;
+  optional string user_id = 5;
   optional int32 page = 6;
   optional int32 page_size = 7;
   optional string ordering = 8;
@@ -174,7 +167,7 @@ message GetExchangeDealsManager {
 
 message GetExchangeDealsItem {
   string id = 1;
-  string customer_id = 2;
+  string user_id = 2;
   optional string payment_id = 3;
   double input_amount = 4;
   string input_currency_id = 5;
@@ -199,7 +192,7 @@ message UpdateExchangeDealRequest {
   AuthManagerContext auth_manager_context = 1;
   string id = 2;
 
-  optional string customer_id = 3;
+  optional string user_id = 3;
   optional double input_amount = 4;
   optional string input_currency_id = 5;
   optional string input_wallet_id = 6;
@@ -226,7 +219,7 @@ message UpdateExchangeDealRequest {
 
 message UpdateExchangeDealResult {
   string id = 1;
-  string customer_id = 2;
+  string user_id = 2;
   double input_amount = 3;
   string input_currency_id = 4;
   double output_amount = 5;
@@ -312,8 +305,8 @@ message GetTransactionsItem {
   optional string comment = 19;
   optional string exchange_id = 20;
   optional string exchange_url = 21;
-  optional string user_id = 22;
-  optional string username = 23;
+  optional string manager_id = 22;
+  optional string manager_name = 23;
   int32 account_type = 24;
 }
 
@@ -324,80 +317,3 @@ message GetTransactionsResponse {
   repeated GetTransactionsItem results = 4;
   repeated GetTransactionsSummaryItem summary = 5;
 }
-
-message GetExchangeDealHistoryStatisticsRequest {
-  optional string date_from = 1;
-  optional string date_to = 2;
-  optional double amount_from = 3;
-  optional double amount_to = 4;
-  optional string input_currency = 5;
-  optional string output_currency = 6;
-  optional string status = 7; // no_payment | with_payment | with_exchange | completed
-  optional string search = 8;
-  optional int32 page = 9;
-  optional int32 page_size = 10;
-}
-
-message GetExchangeDealHistoryStatisticsResponse {
-  repeated ExchangeDealStateByCalculation items = 1;
-}
-
-message GetExchangePaymentRefsByCalculationIdsRequest {
-  repeated string calculation_ids = 1;
-}
-
-message ExchangePaymentRefByCalculation {
-  string calculation_id = 1;
-  string payment_uuid = 2;
-}
-
-message GetExchangePaymentRefsByCalculationIdsResponse {
-  repeated ExchangePaymentRefByCalculation items = 1;
-  repeated string not_found_calculation_ids = 2;
-}
-
-message GetExchangeDealRefsByCalculationIdsRequest {
-  repeated string calculation_ids = 1;
-}
-
-message ExchangeDealRefByCalculation {
-  string calculation_id = 1;
-  string exchange_id = 2;
-  bool status = 3;
-}
-
-message GetExchangeDealRefsByCalculationIdsResponse {
-  repeated ExchangeDealRefByCalculation items = 1;
-  repeated string not_found_calculation_ids = 2;
-}
-
-
-message GetExchangeDealStatesByCalculationIdsRequest {
-  repeated string calculation_ids = 1;
-}
-
-enum ExchangeDealStatus {
-  EXCHANGE_DEAL_STATUS_UNSPECIFIED = 0;
-  EXCHANGE_DEAL_STATUS_NO_DEAL = 1;
-  EXCHANGE_DEAL_STATUS_IN_PROGRESS = 2;
-  EXCHANGE_DEAL_STATUS_COMPLETED = 3;
-  EXCHANGE_DEAL_STATUS_CANCELLED = 4;
-}
-
-enum ExchangeDealAction {
-  EXCHANGE_DEAL_ACTION_UNSPECIFIED = 0;
-  EXCHANGE_DEAL_ACTION_CREATE_DEAL = 1;
-  EXCHANGE_DEAL_ACTION_OPEN_DEAL = 2;
-}
-
-message ExchangeDealStateByCalculation {
-  string calculation_id = 1;
-  optional string deal_id = 2;
-  ExchangeDealStatus status = 3;
-  repeated ExchangeDealAction allowed_actions = 4;
-}
-
-message GetExchangeDealStatesByCalculationIdsResponse {
-  repeated ExchangeDealStateByCalculation items = 1;
-  repeated string not_found_calculation_ids = 2;
-}

package/proto/user.proto

@@ -44,6 +44,10 @@ service UserService {
   // Смена phone: отправка SMS-кода через Twilio.
   rpc RequestChangePhoneCode (RequestChangePhoneCodeRequest) returns (ContactChangeMessageResponse);
   rpc VerifyChangePhoneCode (VerifyChangePhoneCodeRequest) returns (UserResponse);
+  // Батч-поиск пользователей по строке: возвращает только id (с защитой от слишком широкого поиска).
+  rpc BatchGetUserIdsBySearch (BatchGetUserIdsBySearchRequest) returns (BatchGetUserIdsBySearchResponse);
+  // Батч-получение публичных данных пользователей по списку id (для enrichment в других сервисах).
+  rpc BatchGetUsersByIds (BatchGetUsersByIdsRequest) returns (BatchGetUsersByIdsResponse);
 }
 
 enum UserStatus {
@@ -376,6 +380,38 @@ message ContactChangeMessageResponse {
   string message = 1;
 }
 
+message BatchGetUserIdsBySearchRequest {
+  string search = 1;
+  // Максимум возвращаемых id; сервис может дополнительно ограничить.
+  int32 limit = 2;
+}
+
+message BatchGetUserIdsBySearchResponse {
+  repeated int32 user_ids = 1;
+  // true, если совпадений больше, чем limit (результат был обрезан).
+  bool too_many_matches = 2;
+  int32 total_matches = 3;
+}
+
+message BatchGetUsersByIdsRequest {
+  repeated int32 user_ids = 1;
+}
+
+message BatchUserPublicItem {
+  int32 id = 1;
+  int32 uid = 2;
+  optional string first_name = 3;
+  optional string last_name = 4;
+  optional string avatar = 5;
+  optional string telegram_username = 6;
+  UserStatus status = 7;
+  optional int32 crm_customer_id = 8;
+}
+
+message BatchGetUsersByIdsResponse {
+  repeated BatchUserPublicItem items = 1;
+}
+
 message UserBalance {
   string asset = 1;
   string network = 2;