@arbiwallet/contracts 1.0.202 → 1.0.203

package/gen/exchange_rates.ts

@@ -6,26 +6,29 @@
 
 /* eslint-disable */
 import { GrpcMethod, GrpcStreamMethod } from "@nestjs/microservices";
+import { wrappers } from "protobufjs";
 import { Observable } from "rxjs";
+import { Struct } from "./google/protobuf/struct";
 
 export const protobufPackage = "exchange_rates";
 
 export interface CalculateExchangeRequest {
-  managerUserId: number;
+  managerUserId: string;
+  managerId?: string | undefined;
   inputCurrency: string;
   outputCurrency: string;
   currencyForAmount: string;
   amount: number;
   adjustment?: number | undefined;
   promoDiscount?: number | undefined;
-  customerId?: number | undefined;
+  customerId?: string | undefined;
   disableRounding?: boolean | undefined;
   fixedRate?: number | undefined;
 }
 
-export interface CalculateExchangeResponse {
+export interface CalculateExchangeResult {
   result: boolean;
-  calculationId?: number | undefined;
+  calculationId?: string | undefined;
   inputCurrencyQuantity: number;
   outputCurrencyQuantity: number;
   exchangeRateForMessage: string;
@@ -34,21 +37,28 @@ export interface CalculateExchangeResponse {
   finalPercent: number;
   adjustment: number;
   hasCustomer: boolean;
-  customerId?: number | undefined;
+  customerId?: string | undefined;
   availableAgents: number[];
 }
 
+export interface CalculateExchangeResponse {
+  ok: boolean;
+  result?: CalculateExchangeResult | undefined;
+  error?: string | undefined;
+  validationErrors?: { [key: string]: any } | undefined;
+}
+
 export interface GetExchangeCalculationRequest {
-  calculationId?: number | undefined;
+  calculationId: string;
 }
 
 export interface ExchangeCalculation {
-  id: number;
-  customerId?: number | undefined;
-  managerId?: number | undefined;
-  inputCurrencyId: number;
-  outputCurrencyId: number;
-  currencyForAmountId: number;
+  id: string;
+  customerId?: string | undefined;
+  managerId?: string | undefined;
+  inputCurrencyId: string;
+  outputCurrencyId: string;
+  currencyForAmountId: string;
   amount: number;
   inputCurrencyQuantity: number;
   outputCurrencyQuantity: number;
@@ -62,25 +72,32 @@ export interface ExchangeCalculation {
 }
 
 export interface GetExchangeCalculationResponse {
-  result: boolean;
+  ok: boolean;
   calculation?: ExchangeCalculation | undefined;
+  error?: string | undefined;
+  validationErrors?: { [key: string]: any } | undefined;
 }
 
-export interface GetExchanheRatesRequest {
+export interface GetExchangeRatesRequest {
 }
 
-export interface GetExchanheRatesResponse {
-  dataJson: string;
+export interface GetExchangeRatesResponse {
+  ok: boolean;
+  result?: string | undefined;
+  error?: string | undefined;
+  validationErrors?: { [key: string]: any } | undefined;
 }
 
 export const EXCHANGE_RATES_PACKAGE_NAME = "exchange_rates";
 
+wrappers[".google.protobuf.Struct"] = { fromObject: Struct.wrap, toObject: Struct.unwrap } as any;
+
 export interface ExchangeRatesServiceClient {
   calculateExchange(request: CalculateExchangeRequest): Observable<CalculateExchangeResponse>;
 
   getExchangeCalculation(request: GetExchangeCalculationRequest): Observable<GetExchangeCalculationResponse>;
 
-  getExchanheRates(request: GetExchanheRatesRequest): Observable<GetExchanheRatesResponse>;
+  getExchangeRates(request: GetExchangeRatesRequest): Observable<GetExchangeRatesResponse>;
 }
 
 export interface ExchangeRatesServiceController {
@@ -95,14 +112,14 @@ export interface ExchangeRatesServiceController {
     | Observable<GetExchangeCalculationResponse>
     | GetExchangeCalculationResponse;
 
-  getExchanheRates(
-    request: GetExchanheRatesRequest,
-  ): Promise<GetExchanheRatesResponse> | Observable<GetExchanheRatesResponse> | GetExchanheRatesResponse;
+  getExchangeRates(
+    request: GetExchangeRatesRequest,
+  ): Promise<GetExchangeRatesResponse> | Observable<GetExchangeRatesResponse> | GetExchangeRatesResponse;
 }
 
 export function ExchangeRatesServiceControllerMethods() {
   return function (constructor: Function) {
-    const grpcMethods: string[] = ["calculateExchange", "getExchangeCalculation", "getExchanheRates"];
+    const grpcMethods: string[] = ["calculateExchange", "getExchangeCalculation", "getExchangeRates"];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
       GrpcMethod("ExchangeRatesService", method)(constructor.prototype[method], method, descriptor);

package/gen/google/protobuf/struct.ts

@@ -0,0 +1,197 @@
+// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
+// versions:
+//   protoc-gen-ts_proto  v2.11.4
+//   protoc               v7.34.0
+// source: google/protobuf/struct.proto
+
+/* eslint-disable */
+import { wrappers } from "protobufjs";
+
+export const protobufPackage = "google.protobuf";
+
+/**
+ * `NullValue` is a singleton enumeration to represent the null value for the
+ * `Value` type union.
+ *
+ * The JSON representation for `NullValue` is JSON `null`.
+ */
+export enum NullValue {
+  /** NULL_VALUE - Null value. */
+  NULL_VALUE = 0,
+  UNRECOGNIZED = -1,
+}
+
+/**
+ * `Struct` represents a structured data value, consisting of fields
+ * which map to dynamically typed values. In some languages, `Struct`
+ * might be supported by a native representation. For example, in
+ * scripting languages like JS a struct is represented as an
+ * object. The details of that representation are described together
+ * with the proto support for the language.
+ *
+ * The JSON representation for `Struct` is JSON object.
+ */
+export interface Struct {
+  /** Unordered map of dynamically typed values. */
+  fields: { [key: string]: any | undefined };
+}
+
+export interface Struct_FieldsEntry {
+  key: string;
+  value: any | undefined;
+}
+
+/**
+ * `Value` represents a dynamically typed value which can be either
+ * null, a number, a string, a boolean, a recursive struct value, or a
+ * list of values. A producer of value is expected to set one of these
+ * variants. Absence of any variant indicates an error.
+ *
+ * The JSON representation for `Value` is JSON value.
+ */
+export interface Value {
+  /** Represents a null value. */
+  nullValue?:
+    | NullValue
+    | undefined;
+  /** Represents a double value. */
+  numberValue?:
+    | number
+    | undefined;
+  /** Represents a string value. */
+  stringValue?:
+    | string
+    | undefined;
+  /** Represents a boolean value. */
+  boolValue?:
+    | boolean
+    | undefined;
+  /** Represents a structured value. */
+  structValue?:
+    | { [key: string]: any }
+    | undefined;
+  /** Represents a repeated `Value`. */
+  listValue?: Array<any> | undefined;
+}
+
+/**
+ * `ListValue` is a wrapper around a repeated field of values.
+ *
+ * The JSON representation for `ListValue` is JSON array.
+ */
+export interface ListValue {
+  /** Repeated field of dynamically typed values. */
+  values: any[];
+}
+
+export const GOOGLE_PROTOBUF_PACKAGE_NAME = "google.protobuf";
+
+function createBaseStruct(): Struct {
+  return { fields: {} };
+}
+
+export const Struct: MessageFns<Struct> & StructWrapperFns = {
+  wrap(object: { [key: string]: any } | undefined): Struct {
+    const struct = createBaseStruct();
+
+    if (object !== undefined) {
+      for (const key of globalThis.Object.keys(object)) {
+        struct.fields[key] = Value.wrap(object[key]);
+      }
+    }
+    return struct;
+  },
+
+  unwrap(message: Struct): { [key: string]: any } {
+    const object: { [key: string]: any } = {};
+    if (message.fields) {
+      for (const key of globalThis.Object.keys(message.fields)) {
+        object[key] = Value.unwrap(message.fields[key]);
+      }
+    }
+    return object;
+  },
+};
+
+function createBaseValue(): Value {
+  return {};
+}
+
+export const Value: MessageFns<Value> & AnyValueWrapperFns = {
+  wrap(value: any): Value {
+    const result = {} as any;
+    if (value === null) {
+      result.nullValue = NullValue.NULL_VALUE;
+    } else if (typeof value === "boolean") {
+      result.boolValue = value;
+    } else if (typeof value === "number") {
+      result.numberValue = value;
+    } else if (typeof value === "string") {
+      result.stringValue = value;
+    } else if (globalThis.Array.isArray(value)) {
+      result.listValue = ListValue.wrap(value);
+    } else if (typeof value === "object") {
+      result.structValue = Struct.wrap(value);
+    } else if (typeof value !== "undefined") {
+      throw new globalThis.Error("Unsupported any value type: " + typeof value);
+    }
+    return result;
+  },
+
+  unwrap(message: any): string | number | boolean | Object | null | Array<any> | undefined {
+    if (message?.hasOwnProperty("stringValue") && message.stringValue !== undefined) {
+      return message.stringValue;
+    } else if (message?.hasOwnProperty("numberValue") && message?.numberValue !== undefined) {
+      return message.numberValue;
+    } else if (message?.hasOwnProperty("boolValue") && message?.boolValue !== undefined) {
+      return message.boolValue;
+    } else if (message?.hasOwnProperty("structValue") && message?.structValue !== undefined) {
+      return Struct.unwrap(message.structValue as any);
+    } else if (message?.hasOwnProperty("listValue") && message?.listValue !== undefined) {
+      return ListValue.unwrap(message.listValue);
+    } else if (message?.hasOwnProperty("nullValue") && message?.nullValue !== undefined) {
+      return null;
+    }
+    return undefined;
+  },
+};
+
+function createBaseListValue(): ListValue {
+  return { values: [] };
+}
+
+export const ListValue: MessageFns<ListValue> & ListValueWrapperFns = {
+  wrap(array: Array<any> | undefined): ListValue {
+    const result = createBaseListValue();
+    result.values = (array ?? []).map(Value.wrap);
+    return result;
+  },
+
+  unwrap(message: ListValue): Array<any> {
+    if (message?.hasOwnProperty("values") && globalThis.Array.isArray(message.values)) {
+      return message.values.map(Value.unwrap);
+    } else {
+      return message as any;
+    }
+  },
+};
+
+wrappers[".google.protobuf.Struct"] = { fromObject: Struct.wrap, toObject: Struct.unwrap } as any;
+
+export interface MessageFns<T> {
+}
+
+export interface StructWrapperFns {
+  wrap(object: { [key: string]: any } | undefined): Struct;
+  unwrap(message: Struct): { [key: string]: any };
+}
+
+export interface AnyValueWrapperFns {
+  wrap(value: any): Value;
+  unwrap(message: any): string | number | boolean | Object | null | Array<any> | undefined;
+}
+
+export interface ListValueWrapperFns {
+  wrap(array: Array<any> | undefined): ListValue;
+  unwrap(message: ListValue): Array<any>;
+}

package/package.json

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

package/proto/exchange_rates.proto

@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package exchange_rates;
 
+import "google/protobuf/struct.proto";
+
 option csharp_namespace = "ExchangeRates";
 option java_multiple_files = true;
 option java_package = "com.arbiwallet.exchange.rates";
@@ -9,25 +11,27 @@ option java_package = "com.arbiwallet.exchange.rates";
 service ExchangeRatesService {
   rpc CalculateExchange(CalculateExchangeRequest) returns (CalculateExchangeResponse);
   rpc GetExchangeCalculation(GetExchangeCalculationRequest) returns (GetExchangeCalculationResponse);
-  rpc GetExchanheRates(GetExchanheRatesRequest) returns (GetExchanheRatesResponse);
+  rpc GetExchangeRates(GetExchangeRatesRequest) returns (GetExchangeRatesResponse);
 }
 
 message CalculateExchangeRequest {
-  int64 manager_user_id = 1;
-  string input_currency = 2;
-  string output_currency = 3;
-  string currency_for_amount = 4;
-  double amount = 5;
-  optional double adjustment = 6;
-  optional double promo_discount = 7;
-  optional int64 customer_id = 8;
-  optional bool disable_rounding = 9;
-  optional double fixed_rate = 10;
+  string manager_user_id = 1;
+  optional string manager_id = 2;
+
+  string input_currency = 3;
+  string output_currency = 4;
+  string currency_for_amount = 5;
+  double amount = 6;
+  optional double adjustment = 7;
+  optional double promo_discount = 8;
+  optional string customer_id = 9;
+  optional bool disable_rounding = 10;
+  optional double fixed_rate = 11;
 }
 
-message CalculateExchangeResponse {
+message CalculateExchangeResult {
   bool result = 1;
-  optional int64 calculation_id = 2;
+  optional string calculation_id = 2;
   double input_currency_quantity = 3;
   double output_currency_quantity = 4;
   string exchange_rate_for_message = 5;
@@ -36,21 +40,28 @@ message CalculateExchangeResponse {
   double final_percent = 8;
   double adjustment = 9;
   bool has_customer = 10;
-  optional int64 customer_id = 11;
-  repeated int64 available_agents = 12;
+  optional string customer_id = 11;
+  repeated int32 available_agents = 12;
+}
+
+message CalculateExchangeResponse {
+  bool ok = 1;
+  optional CalculateExchangeResult result = 2;
+  optional string error = 3;
+  optional google.protobuf.Struct validationErrors = 4;
 }
 
 message GetExchangeCalculationRequest {
-  optional int64 calculation_id = 1;
+  string calculation_id = 1;
 }
 
 message ExchangeCalculation {
-  int64 id = 1;
-  optional int64 customer_id = 2;
-  optional int64 manager_id = 3;
-  int64 input_currency_id = 4;
-  int64 output_currency_id = 5;
-  int64 currency_for_amount_id = 6;
+  string id = 1;
+  optional string customer_id = 2;
+  optional string manager_id = 3;
+  string input_currency_id = 4;
+  string output_currency_id = 5;
+  string currency_for_amount_id = 6;
   double amount = 7;
   double input_currency_quantity = 8;
   double output_currency_quantity = 9;
@@ -64,12 +75,17 @@ message ExchangeCalculation {
 }
 
 message GetExchangeCalculationResponse {
-  bool result = 1;
+  bool ok = 1;
   optional ExchangeCalculation calculation = 2;
+  optional string error = 3;
+  optional google.protobuf.Struct validationErrors = 4;
 }
 
-message GetExchanheRatesRequest {}
+message GetExchangeRatesRequest {}
 
-message GetExchanheRatesResponse {
-  string data_json = 1;
+message GetExchangeRatesResponse {
+  bool ok = 1;
+  optional string result = 2;
+  optional string error = 3;
+  optional google.protobuf.Struct validationErrors = 4;
 }