@arbiwallet/contracts 1.0.60 → 1.0.63

package/gen/payout.ts

@@ -18,96 +18,45 @@ export interface ParsePromptPayQrRequest {
 
 export interface ParsePromptPayQrResponse {
   scanId: number;
-  quoteId: string;
-  status: string;
-  payloadJson: string;
-}
-
-export interface ConfirmPayoutPaymentRequest {
-  scanId: number;
-  quoteId: string;
-  userId: string;
-}
-
-export interface ConfirmPayoutPaymentResponse {
-  payoutId: number;
-  status: string;
-  payloadJson: string;
-}
-
-export interface HandlePayoutWebhookRequest {
-  payloadJson: string;
-}
-
-export interface HandlePayoutWebhookResponse {
-  ok: boolean;
-}
-
-export interface ParseMusePayPromptPayQrTestRequest {
-  qrString: string;
-  userId: string;
-  amount: number;
-}
-
-export interface ParseMusePayPromptPayQrTestResponse {
-  scanId: number;
-  quoteId: string;
-  status: string;
-  payloadJson: string;
   inputAmountToPay: string;
   inputCurrencyToPay: string;
   convertedAmountToPay: string;
   convertedCurrencyToPay: string;
+  feePercent: number;
+  feeOnConverted: string;
+  convertedAmountWithFee: string;
 }
 
-export interface ParseMusePayPromptPayQrRequest {
-  qrString: string;
-  userId: string;
-  amount: number;
-}
-
-export interface ParseMusePayPromptPayQrResponse {
-  scanId: number;
-  quoteId: string;
-  status: string;
-  payloadJson: string;
-  inputAmountToPay: string;
-  inputCurrencyToPay: string;
-  convertedAmountToPay: string;
-  convertedCurrencyToPay: string;
-}
-
-export interface ConfirmMusePayPayoutPaymentRequest {
+export interface ConfirmPayoutPaymentRequest {
   scanId: number;
-  quoteId: string;
   userId: string;
 }
 
-export interface ConfirmMusePayPayoutPaymentResponse {
+export interface ConfirmPayoutPaymentResponse {
   payoutId: number;
   status: string;
-  payloadJson: string;
 }
 
-export interface HandleMusePayWebhookRequest {
+export interface HandlePayoutWebhookRequest {
   rawBody: Uint8Array;
 }
 
-export interface HandleMusePayWebhookResponse {
-  payoutId: number;
-  status: string;
-  handled: boolean;
+export interface HandlePayoutWebhookResponse {
+  ok: boolean;
 }
 
 export interface GetPayoutRequest {
   payoutId: number;
-  userId: string;
 }
 
 export interface GetPayoutResponse {
   payoutId: number;
+  scanId: number;
   status: string;
-  payloadJson: string;
+  finalConvertedAmount?: string | undefined;
+  finalConvertedCurrency?: string | undefined;
+  createdAt: string;
+  completedAt?: string | undefined;
 }
 
 export const PAYOUT_V1_PACKAGE_NAME = "payout.v1";
@@ -119,18 +68,6 @@ export interface PayoutServiceClient {
 
   handlePayoutWebhook(request: HandlePayoutWebhookRequest): Observable<HandlePayoutWebhookResponse>;
 
-  parseMusePayPromptPayQrTest(
-    request: ParseMusePayPromptPayQrTestRequest,
-  ): Observable<ParseMusePayPromptPayQrTestResponse>;
-
-  parseMusePayPromptPayQr(request: ParseMusePayPromptPayQrRequest): Observable<ParseMusePayPromptPayQrResponse>;
-
-  confirmMusePayPayoutPayment(
-    request: ConfirmMusePayPayoutPaymentRequest,
-  ): Observable<ConfirmMusePayPayoutPaymentResponse>;
-
-  handleMusePayWebhook(request: HandleMusePayWebhookRequest): Observable<HandleMusePayWebhookResponse>;
-
   getPayout(request: GetPayoutRequest): Observable<GetPayoutResponse>;
 }
 
@@ -147,46 +84,12 @@ export interface PayoutServiceController {
     request: HandlePayoutWebhookRequest,
   ): Promise<HandlePayoutWebhookResponse> | Observable<HandlePayoutWebhookResponse> | HandlePayoutWebhookResponse;
 
-  parseMusePayPromptPayQrTest(
-    request: ParseMusePayPromptPayQrTestRequest,
-  ):
-    | Promise<ParseMusePayPromptPayQrTestResponse>
-    | Observable<ParseMusePayPromptPayQrTestResponse>
-    | ParseMusePayPromptPayQrTestResponse;
-
-  parseMusePayPromptPayQr(
-    request: ParseMusePayPromptPayQrRequest,
-  ):
-    | Promise<ParseMusePayPromptPayQrResponse>
-    | Observable<ParseMusePayPromptPayQrResponse>
-    | ParseMusePayPromptPayQrResponse;
-
-  confirmMusePayPayoutPayment(
-    request: ConfirmMusePayPayoutPaymentRequest,
-  ):
-    | Promise<ConfirmMusePayPayoutPaymentResponse>
-    | Observable<ConfirmMusePayPayoutPaymentResponse>
-    | ConfirmMusePayPayoutPaymentResponse;
-
-  handleMusePayWebhook(
-    request: HandleMusePayWebhookRequest,
-  ): Promise<HandleMusePayWebhookResponse> | Observable<HandleMusePayWebhookResponse> | HandleMusePayWebhookResponse;
-
   getPayout(request: GetPayoutRequest): Promise<GetPayoutResponse> | Observable<GetPayoutResponse> | GetPayoutResponse;
 }
 
 export function PayoutServiceControllerMethods() {
   return function (constructor: Function) {
-    const grpcMethods: string[] = [
-      "parsePromptPayQr",
-      "confirmPayoutPayment",
-      "handlePayoutWebhook",
-      "parseMusePayPromptPayQrTest",
-      "parseMusePayPromptPayQr",
-      "confirmMusePayPayoutPayment",
-      "handleMusePayWebhook",
-      "getPayout",
-    ];
+    const grpcMethods: string[] = ["parsePromptPayQr", "confirmPayoutPayment", "handlePayoutWebhook", "getPayout"];
     for (const method of grpcMethods) {
       const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
       GrpcMethod("PayoutService", method)(constructor.prototype[method], method, descriptor);

package/gen/user.ts

@@ -134,6 +134,9 @@ export interface SubmitWalletCrmExchangeOrderRequest {
   outputCurrency: number;
   withdrawType: number;
   receiveBank?: number | undefined;
+  exchangeRateDisplay?: number | undefined;
+  sendCurrencyShort?: string | undefined;
+  receiveCurrencyShort?: string | undefined;
 }
 
 export interface SubmitWalletCrmExchangeOrderResponse {
@@ -142,6 +145,23 @@ export interface SubmitWalletCrmExchangeOrderResponse {
   message?: string | undefined;
 }
 
+export interface ListWalletExchangeRecentPairsRequest {
+  walletUserId: number;
+  /** По умолчанию 20, максимум обрезается на сервисе. */
+  limit: number;
+}
+
+export interface WalletExchangeRecentPairItem {
+  sendCurrencyShort: string;
+  receiveCurrencyShort: string;
+  lastInputAmount: number;
+  lastSubmittedAtUnixMs: number;
+}
+
+export interface ListWalletExchangeRecentPairsResponse {
+  pairs: WalletExchangeRecentPairItem[];
+}
+
 export interface UserBalance {
   asset: string;
   network: string;
@@ -189,6 +209,12 @@ export interface UserServiceClient {
   submitWalletCrmExchangeOrder(
     request: SubmitWalletCrmExchangeOrderRequest,
   ): Observable<SubmitWalletCrmExchangeOrderResponse>;
+
+  /** Уникальные валютные пары из последних заявок на обмен (по БД user-service), без дубликатов пар. */
+
+  listWalletExchangeRecentPairs(
+    request: ListWalletExchangeRecentPairsRequest,
+  ): Observable<ListWalletExchangeRecentPairsResponse>;
 }
 
 export interface UserServiceController {
@@ -229,6 +255,15 @@ export interface UserServiceController {
     | Promise<SubmitWalletCrmExchangeOrderResponse>
     | Observable<SubmitWalletCrmExchangeOrderResponse>
     | SubmitWalletCrmExchangeOrderResponse;
+
+  /** Уникальные валютные пары из последних заявок на обмен (по БД user-service), без дубликатов пар. */
+
+  listWalletExchangeRecentPairs(
+    request: ListWalletExchangeRecentPairsRequest,
+  ):
+    | Promise<ListWalletExchangeRecentPairsResponse>
+    | Observable<ListWalletExchangeRecentPairsResponse>
+    | ListWalletExchangeRecentPairsResponse;
 }
 
 export function UserServiceControllerMethods() {
@@ -242,6 +277,7 @@ export function UserServiceControllerMethods() {
       "getCrmSession",
       "crmExchangeHttp",
       "submitWalletCrmExchangeOrder",
+      "listWalletExchangeRecentPairs",
     ];
     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.60",
+  "version": "1.0.63",
   "scripts": {
     "generate": "protoc -I ./proto ./proto/*.proto --ts_proto_out=./gen --ts_proto_opt=nestJs=true,package=omit"
   },

package/proto/payout.proto

@@ -10,10 +10,6 @@ service PayoutService {
   rpc ParsePromptPayQr(ParsePromptPayQrRequest) returns (ParsePromptPayQrResponse);
   rpc ConfirmPayoutPayment(ConfirmPayoutPaymentRequest) returns (ConfirmPayoutPaymentResponse);
   rpc HandlePayoutWebhook(HandlePayoutWebhookRequest) returns (HandlePayoutWebhookResponse);
-  rpc ParseMusePayPromptPayQrTest(ParseMusePayPromptPayQrTestRequest) returns (ParseMusePayPromptPayQrTestResponse);
-  rpc ParseMusePayPromptPayQr(ParseMusePayPromptPayQrRequest) returns (ParseMusePayPromptPayQrResponse);
-  rpc ConfirmMusePayPayoutPayment(ConfirmMusePayPayoutPaymentRequest) returns (ConfirmMusePayPayoutPaymentResponse);
-  rpc HandleMusePayWebhook(HandleMusePayWebhookRequest) returns (HandleMusePayWebhookResponse);
   rpc GetPayout(GetPayoutRequest) returns (GetPayoutResponse);
 }
 
@@ -25,94 +21,43 @@ message ParsePromptPayQrRequest {
 
 message ParsePromptPayQrResponse {
   int64 scan_id = 1;
-  string quote_id = 2;
-  string status = 3;
-  string payload_json = 4;
+  string input_amount_to_pay = 2;
+  string input_currency_to_pay = 3;
+  string converted_amount_to_pay = 4;
+  string converted_currency_to_pay = 5;
+  double fee_percent = 6;
+  string fee_on_converted = 7;
+  string converted_amount_with_fee = 8;
 }
 
 message ConfirmPayoutPaymentRequest {
   int64 scan_id = 1;
-  string quote_id = 2;
   string user_id = 3;
 }
 
 message ConfirmPayoutPaymentResponse {
   int64 payout_id = 1;
   string status = 2;
-  string payload_json = 3;
 }
 
 message HandlePayoutWebhookRequest {
-  string payload_json = 1;
+  bytes rawBody = 1;
 }
 
 message HandlePayoutWebhookResponse {
   bool ok = 1;
 }
 
-message ParseMusePayPromptPayQrTestRequest {
-  string qr_string = 1;
-  string user_id = 2;
-  double amount = 3;
-}
-
-message ParseMusePayPromptPayQrTestResponse {
-  int64 scan_id = 1;
-  string quote_id = 2;
-  string status = 3;
-  string payload_json = 4;
-  string input_amount_to_pay = 5;
-  string input_currency_to_pay = 6;
-  string converted_amount_to_pay = 7;
-  string converted_currency_to_pay = 8;
-}
-
-message ParseMusePayPromptPayQrRequest {
-  string qr_string = 1;
-  string user_id = 2;
-  double amount = 3;
-}
-
-message ParseMusePayPromptPayQrResponse {
-  int64 scan_id = 1;
-  string quote_id = 2;
-  string status = 3;
-  string payload_json = 4;
-  string input_amount_to_pay = 5;
-  string input_currency_to_pay = 6;
-  string converted_amount_to_pay = 7;
-  string converted_currency_to_pay = 8;
-}
-
-message ConfirmMusePayPayoutPaymentRequest {
-  int64 scan_id = 1;
-  string quote_id = 2;
-  string user_id = 3;
-}
-
-message ConfirmMusePayPayoutPaymentResponse {
-  int64 payout_id = 1;
-  string status = 2;
-  string payload_json = 3;
-}
-
-message HandleMusePayWebhookRequest {
-  bytes rawBody = 1;
-}
-
-message HandleMusePayWebhookResponse {
-  int64 payout_id = 1;
-  string status = 2;
-  bool handled = 3;
-}
-
 message GetPayoutRequest {
   int64 payout_id = 1;
-  string user_id = 2;
 }
 
 message GetPayoutResponse {
   int64 payout_id = 1;
-  string status = 2;
-  string payload_json = 3;
+  int64 scan_id = 2;
+  string status = 3;
+  optional string final_converted_amount = 4;
+  optional string final_converted_currency = 5;
+  string created_at = 6;
+  optional string completed_at = 7;
 }

package/proto/user.proto

@@ -14,6 +14,8 @@ service UserService {
   rpc CrmExchangeHttp (CrmExchangeHttpRequest) returns (CrmExchangeHttpResponse);
   // Создание/получение CRM-клиента по wallet_user_id и создание заявки на обмен (два шага к CRM внутри сервиса).
   rpc SubmitWalletCrmExchangeOrder (SubmitWalletCrmExchangeOrderRequest) returns (SubmitWalletCrmExchangeOrderResponse);
+  // Уникальные валютные пары из последних заявок на обмен (по БД user-service), без дубликатов пар.
+  rpc ListWalletExchangeRecentPairs (ListWalletExchangeRecentPairsRequest) returns (ListWalletExchangeRecentPairsResponse);
 }
 
 enum UserStatus {
@@ -136,6 +138,9 @@ message SubmitWalletCrmExchangeOrderRequest {
   int32 output_currency = 5;
   int32 withdraw_type = 6;
   optional int32 receive_bank = 7;
+  optional double exchange_rate_display = 8;
+  optional string send_currency_short = 9;
+  optional string receive_currency_short = 10;
 }
 
 message SubmitWalletCrmExchangeOrderResponse {
@@ -144,6 +149,23 @@ message SubmitWalletCrmExchangeOrderResponse {
   optional string message = 3;
 }
 
+message ListWalletExchangeRecentPairsRequest {
+  int32 wallet_user_id = 1;
+  // По умолчанию 20, максимум обрезается на сервисе.
+  int32 limit = 2;
+}
+
+message WalletExchangeRecentPairItem {
+  string send_currency_short = 1;
+  string receive_currency_short = 2;
+  double last_input_amount = 3;
+  int64 last_submitted_at_unix_ms = 4;
+}
+
+message ListWalletExchangeRecentPairsResponse {
+  repeated WalletExchangeRecentPairItem pairs = 1;
+}
+
 message UserBalance {
   string asset = 1;
   string network = 2;