update dist

dist/HavenoClient.d.ts

@@ -1,7 +1,7 @@
 import type * as grpcWeb from "grpc-web";
 import { GetVersionClient, AccountClient, MoneroConnectionsClient, DisputesClient, DisputeAgentsClient, NotificationsClient, WalletsClient, PriceClient, OffersClient, PaymentAccountsClient, TradesClient, ShutdownServerClient, MoneroNodeClient } from './protobuf/GrpcServiceClientPb';
 import { MarketPriceInfo, MarketDepthInfo, XmrBalanceInfo, OfferInfo, TradeInfo, XmrTx, XmrDestination, NotificationMessage, UrlConnection } from "./protobuf/grpc_pb";
-import { PaymentMethod, PaymentAccount, Attachment, DisputeResult, Dispute, ChatMessage, MoneroNodeSettings } from "./protobuf/pb_pb";
+import { PaymentMethod, PaymentAccountForm, PaymentAccountFormField, PaymentAccount, Attachment, DisputeResult, Dispute, ChatMessage, MoneroNodeSettings } from "./protobuf/pb_pb";
 /**
  * Haveno daemon client.
  */
@@ -33,6 +33,7 @@ export default class HavenoClient {
     _paymentMethods: PaymentMethod[] | undefined;
     static readonly _fullyInitializedMessage = "Application fully initialized";
     static readonly _loginRequiredMessage = "Interactive login required";
+    onData: (data: any) => void;
     /**
      * Construct a client connected to a Haveno daemon.
      *
@@ -232,7 +233,7 @@ export default class HavenoClient {
     /**
      * Returns whether daemon is running a local monero node.
      */
-    isMoneroNodeRunning(): Promise<boolean>;
+    isMoneroNodeOnline(): Promise<boolean>;
     /**
      * Gets the current local monero node settings.
      */
@@ -254,6 +255,12 @@ export default class HavenoClient {
      * @param {string} registrationKey - registration key
      */
     registerDisputeAgent(disputeAgentType: string, registrationKey: string): Promise<void>;
+    /**
+     * Unregister as a dispute agent.
+     *
+     * @param {string} disputeAgentType - type of dispute agent to register, e.g. mediator, refundagent
+     */
+    unregisterDisputeAgent(disputeAgentType: string): Promise<void>;
     /**
      * Get the user's balances.
      *
@@ -354,16 +361,18 @@ export default class HavenoClient {
     /**
      * Get a form for the given payment method to complete and create a new payment account.
      *
-     * @return {object} the payment account form as JSON
+     * @param {string} paymentMethodId - the id of the payment method
+     * @return {PaymentAccountForm} the payment account form
      */
-    getPaymentAccountForm(paymentMethodId: string): Promise<any>;
+    getPaymentAccountForm(paymentMethodId: string): Promise<PaymentAccountForm>;
+    validateFormField(form: PaymentAccountForm, fieldId: PaymentAccountFormField.FieldId, value: string): Promise<void>;
     /**
      * Create a payment account.
      *
-     * @param {object} paymentAccountForm - the completed form as JSON to create the payment account
+     * @param {PaymentAccountForm} paymentAccountForm - the completed form to create the payment account
      * @return {PaymentAccount} the created payment account
      */
-    createPaymentAccount(paymentAccountForm: any): Promise<PaymentAccount>;
+    createPaymentAccount(paymentAccountForm: PaymentAccountForm): Promise<PaymentAccount>;
     /**
      * Create a crypto payment account.
      *

dist/HavenoClient.js

@@ -25,6 +25,12 @@ class HavenoClient {
         this._notificationListeners = [];
         this._registerNotificationListenerCalled = false;
         this._keepAlivePeriodMs = 60000;
+        this.onData = (data) => {
+            if (data instanceof grpc_pb_1.NotificationMessage) {
+                for (const listener of this._notificationListeners)
+                    listener(data);
+            }
+        };
         if (!url)
             throw new HavenoError_1.default("Must provide URL of Haveno daemon");
         if (!password)
@@ -668,10 +674,10 @@ class HavenoClient {
     /**
      * Returns whether daemon is running a local monero node.
      */
-    async isMoneroNodeRunning() {
+    async isMoneroNodeOnline() {
         try {
             return await new Promise((resolve, reject) => {
-                this._moneroNodeClient.isMoneroNodeRunning(new grpc_pb_1.IsMoneroNodeRunningRequest(), { password: this._password }, function (err, response) {
+                this._moneroNodeClient.isMoneroNodeOnline(new grpc_pb_1.IsMoneroNodeOnlineRequest(), { password: this._password }, function (err, response) {
                     if (err)
                         reject(err);
                     else
@@ -765,6 +771,26 @@ class HavenoClient {
             throw new HavenoError_1.default(e.message, e.code);
         }
     }
+    /**
+     * Unregister as a dispute agent.
+     *
+     * @param {string} disputeAgentType - type of dispute agent to register, e.g. mediator, refundagent
+     */
+    async unregisterDisputeAgent(disputeAgentType) {
+        try {
+            return await new Promise((resolve, reject) => {
+                this._disputeAgentsClient.unregisterDisputeAgent(new grpc_pb_1.UnregisterDisputeAgentRequest().setDisputeAgentType(disputeAgentType), { password: this._password }, function (err) {
+                    if (err)
+                        reject(err);
+                    else
+                        resolve();
+                });
+            });
+        }
+        catch (e) {
+            throw new HavenoError_1.default(e.message, e.code);
+        }
+    }
     /**
      * Get the user's balances.
      *
@@ -1063,7 +1089,8 @@ class HavenoClient {
     /**
      * Get a form for the given payment method to complete and create a new payment account.
      *
-     * @return {object} the payment account form as JSON
+     * @param {string} paymentMethodId - the id of the payment method
+     * @return {PaymentAccountForm} the payment account form
      */
     async getPaymentAccountForm(paymentMethodId) {
         try {
@@ -1072,7 +1099,33 @@ class HavenoClient {
                     if (err)
                         reject(err);
                     else
-                        resolve(JSON.parse(response.getPaymentAccountFormJson()));
+                        resolve(response.getPaymentAccountForm());
+                });
+            });
+        }
+        catch (e) {
+            throw new HavenoError_1.default(e.message, e.code);
+        }
+    }
+    /*
+     * Validate a form field.
+     *
+     * @param {object} form - form context to validate the given value
+     * @param {PaymentAccountFormField.FieldId} fieldId - id of the field to validate
+     * @param {string} value - input value to validate
+     */
+    async validateFormField(form, fieldId, value) {
+        const request = new grpc_pb_1.ValidateFormFieldRequest()
+            .setForm(form)
+            .setFieldId(fieldId)
+            .setValue(value);
+        try {
+            await new Promise((resolve, reject) => {
+                this._paymentAccountsClient.validateFormField(request, { password: this._password }, function (err) {
+                    if (err)
+                        reject(err);
+                    else
+                        resolve();
                 });
             });
         }
@@ -1083,13 +1136,13 @@ class HavenoClient {
     /**
      * Create a payment account.
      *
-     * @param {object} paymentAccountForm - the completed form as JSON to create the payment account
+     * @param {PaymentAccountForm} paymentAccountForm - the completed form to create the payment account
      * @return {PaymentAccount} the created payment account
      */
     async createPaymentAccount(paymentAccountForm) {
         try {
             return await new Promise((resolve, reject) => {
-                this._paymentAccountsClient.createPaymentAccount(new grpc_pb_1.CreatePaymentAccountRequest().setPaymentAccountForm(JSON.stringify(paymentAccountForm)), { password: this._password }, function (err, response) {
+                this._paymentAccountsClient.createPaymentAccount(new grpc_pb_1.CreatePaymentAccountRequest().setPaymentAccountForm(paymentAccountForm), { password: this._password }, function (err, response) {
                     if (err)
                         reject(err);
                     else
@@ -1628,12 +1681,7 @@ class HavenoClient {
                 await new Promise((resolve) => {
                     // send request to register client listener
                     this._notificationStream = this._notificationsClient.registerNotificationListener(new grpc_pb_1.RegisterNotificationListenerRequest(), { password: this._password })
-                        .on('data', (data) => {
+                        .on('data', this.onData);
-                        if (data instanceof grpc_pb_1.NotificationMessage) {
-                            for (const listener of this._notificationListeners)
-                                listener(data);
-                        }
-                    });
                     // periodically send keep alive requests // TODO (woodser): better way to keep notification stream alive?
                     let firstRequest = true;
                     this._keepAliveLooper = new TaskLooper_1.default(async () => {
@@ -1650,6 +1698,7 @@ class HavenoClient {
                 });
             }
             else {
+                this._notificationStream.removeListener('data', this.onData);
                 this._keepAliveLooper.stop();
                 this._notificationStream.cancel();
                 this._notificationStream = undefined;

dist/protobuf/GrpcServiceClientPb.d.ts

@@ -19,7 +19,7 @@ export declare class HelpClient {
     }, options?: null | {
         [index: string]: any;
     });
-    methodInfoGetMethodHelp: grpcWeb.MethodDescriptor<grpc_pb.GetMethodHelpRequest, grpc_pb.GetMethodHelpReply>;
+    methodDescriptorGetMethodHelp: grpcWeb.MethodDescriptor<grpc_pb.GetMethodHelpRequest, grpc_pb.GetMethodHelpReply>;
     getMethodHelp(request: grpc_pb.GetMethodHelpRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetMethodHelpReply>;
     getMethodHelp(request: grpc_pb.GetMethodHelpRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetMethodHelpReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetMethodHelpReply>;
 }
@@ -37,7 +37,7 @@ export declare class GetVersionClient {
     }, options?: null | {
         [index: string]: any;
     });
-    methodInfoGetVersion: grpcWeb.MethodDescriptor<grpc_pb.GetVersionRequest, grpc_pb.GetVersionReply>;
+    methodDescriptorGetVersion: grpcWeb.MethodDescriptor<grpc_pb.GetVersionRequest, grpc_pb.GetVersionReply>;
     getVersion(request: grpc_pb.GetVersionRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetVersionReply>;
     getVersion(request: grpc_pb.GetVersionRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetVersionReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetVersionReply>;
 }
@@ -55,33 +55,33 @@ export declare class AccountClient {
     }, options?: null | {
         [index: string]: any;
     });
-    methodInfoAccountExists: grpcWeb.MethodDescriptor<grpc_pb.AccountExistsRequest, grpc_pb.AccountExistsReply>;
+    methodDescriptorAccountExists: grpcWeb.MethodDescriptor<grpc_pb.AccountExistsRequest, grpc_pb.AccountExistsReply>;
     accountExists(request: grpc_pb.AccountExistsRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.AccountExistsReply>;
     accountExists(request: grpc_pb.AccountExistsRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.AccountExistsReply) => void): grpcWeb.ClientReadableStream<grpc_pb.AccountExistsReply>;
-    methodInfoIsAccountOpen: grpcWeb.MethodDescriptor<grpc_pb.IsAccountOpenRequest, grpc_pb.IsAccountOpenReply>;
+    methodDescriptorIsAccountOpen: grpcWeb.MethodDescriptor<grpc_pb.IsAccountOpenRequest, grpc_pb.IsAccountOpenReply>;
     isAccountOpen(request: grpc_pb.IsAccountOpenRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.IsAccountOpenReply>;
     isAccountOpen(request: grpc_pb.IsAccountOpenRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.IsAccountOpenReply) => void): grpcWeb.ClientReadableStream<grpc_pb.IsAccountOpenReply>;
-    methodInfoCreateAccount: grpcWeb.MethodDescriptor<grpc_pb.CreateAccountRequest, grpc_pb.CreateAccountReply>;
+    methodDescriptorCreateAccount: grpcWeb.MethodDescriptor<grpc_pb.CreateAccountRequest, grpc_pb.CreateAccountReply>;
     createAccount(request: grpc_pb.CreateAccountRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.CreateAccountReply>;
     createAccount(request: grpc_pb.CreateAccountRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.CreateAccountReply) => void): grpcWeb.ClientReadableStream<grpc_pb.CreateAccountReply>;
-    methodInfoOpenAccount: grpcWeb.MethodDescriptor<grpc_pb.OpenAccountRequest, grpc_pb.OpenAccountReply>;
+    methodDescriptorOpenAccount: grpcWeb.MethodDescriptor<grpc_pb.OpenAccountRequest, grpc_pb.OpenAccountReply>;
     openAccount(request: grpc_pb.OpenAccountRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.OpenAccountReply>;
     openAccount(request: grpc_pb.OpenAccountRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.OpenAccountReply) => void): grpcWeb.ClientReadableStream<grpc_pb.OpenAccountReply>;
-    methodInfoIsAppInitialized: grpcWeb.MethodDescriptor<grpc_pb.IsAppInitializedRequest, grpc_pb.IsAppInitializedReply>;
+    methodDescriptorIsAppInitialized: grpcWeb.MethodDescriptor<grpc_pb.IsAppInitializedRequest, grpc_pb.IsAppInitializedReply>;
     isAppInitialized(request: grpc_pb.IsAppInitializedRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.IsAppInitializedReply>;
     isAppInitialized(request: grpc_pb.IsAppInitializedRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.IsAppInitializedReply) => void): grpcWeb.ClientReadableStream<grpc_pb.IsAppInitializedReply>;
-    methodInfoChangePassword: grpcWeb.MethodDescriptor<grpc_pb.ChangePasswordRequest, grpc_pb.ChangePasswordReply>;
+    methodDescriptorChangePassword: grpcWeb.MethodDescriptor<grpc_pb.ChangePasswordRequest, grpc_pb.ChangePasswordReply>;
     changePassword(request: grpc_pb.ChangePasswordRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.ChangePasswordReply>;
     changePassword(request: grpc_pb.ChangePasswordRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.ChangePasswordReply) => void): grpcWeb.ClientReadableStream<grpc_pb.ChangePasswordReply>;
-    methodInfoCloseAccount: grpcWeb.MethodDescriptor<grpc_pb.CloseAccountRequest, grpc_pb.CloseAccountReply>;
+    methodDescriptorCloseAccount: grpcWeb.MethodDescriptor<grpc_pb.CloseAccountRequest, grpc_pb.CloseAccountReply>;
     closeAccount(request: grpc_pb.CloseAccountRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.CloseAccountReply>;
     closeAccount(request: grpc_pb.CloseAccountRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.CloseAccountReply) => void): grpcWeb.ClientReadableStream<grpc_pb.CloseAccountReply>;
-    methodInfoDeleteAccount: grpcWeb.MethodDescriptor<grpc_pb.DeleteAccountRequest, grpc_pb.DeleteAccountReply>;
+    methodDescriptorDeleteAccount: grpcWeb.MethodDescriptor<grpc_pb.DeleteAccountRequest, grpc_pb.DeleteAccountReply>;
     deleteAccount(request: grpc_pb.DeleteAccountRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.DeleteAccountReply>;
     deleteAccount(request: grpc_pb.DeleteAccountRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.DeleteAccountReply) => void): grpcWeb.ClientReadableStream<grpc_pb.DeleteAccountReply>;
-    methodInfoBackupAccount: grpcWeb.MethodDescriptor<grpc_pb.BackupAccountRequest, grpc_pb.BackupAccountReply>;
+    methodDescriptorBackupAccount: grpcWeb.MethodDescriptor<grpc_pb.BackupAccountRequest, grpc_pb.BackupAccountReply>;
     backupAccount(request: grpc_pb.BackupAccountRequest, metadata?: grpcWeb.Metadata): grpcWeb.ClientReadableStream<grpc_pb.BackupAccountReply>;
-    methodInfoRestoreAccount: grpcWeb.MethodDescriptor<grpc_pb.RestoreAccountRequest, grpc_pb.RestoreAccountReply>;
+    methodDescriptorRestoreAccount: grpcWeb.MethodDescriptor<grpc_pb.RestoreAccountRequest, grpc_pb.RestoreAccountReply>;
     restoreAccount(request: grpc_pb.RestoreAccountRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.RestoreAccountReply>;
     restoreAccount(request: grpc_pb.RestoreAccountRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.RestoreAccountReply) => void): grpcWeb.ClientReadableStream<grpc_pb.RestoreAccountReply>;
 }
@@ -99,19 +99,19 @@ export declare class DisputesClient {
     }, options?: null | {
         [index: string]: any;
     });
-    methodInfoGetDispute: grpcWeb.MethodDescriptor<grpc_pb.GetDisputeRequest, grpc_pb.GetDisputeReply>;
+    methodDescriptorGetDispute: grpcWeb.MethodDescriptor<grpc_pb.GetDisputeRequest, grpc_pb.GetDisputeReply>;
     getDispute(request: grpc_pb.GetDisputeRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetDisputeReply>;
     getDispute(request: grpc_pb.GetDisputeRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetDisputeReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetDisputeReply>;
-    methodInfoGetDisputes: grpcWeb.MethodDescriptor<grpc_pb.GetDisputesRequest, grpc_pb.GetDisputesReply>;
+    methodDescriptorGetDisputes: grpcWeb.MethodDescriptor<grpc_pb.GetDisputesRequest, grpc_pb.GetDisputesReply>;
     getDisputes(request: grpc_pb.GetDisputesRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetDisputesReply>;
     getDisputes(request: grpc_pb.GetDisputesRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetDisputesReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetDisputesReply>;
-    methodInfoOpenDispute: grpcWeb.MethodDescriptor<grpc_pb.OpenDisputeRequest, grpc_pb.OpenDisputeReply>;
+    methodDescriptorOpenDispute: grpcWeb.MethodDescriptor<grpc_pb.OpenDisputeRequest, grpc_pb.OpenDisputeReply>;
     openDispute(request: grpc_pb.OpenDisputeRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.OpenDisputeReply>;
     openDispute(request: grpc_pb.OpenDisputeRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.OpenDisputeReply) => void): grpcWeb.ClientReadableStream<grpc_pb.OpenDisputeReply>;
-    methodInfoResolveDispute: grpcWeb.MethodDescriptor<grpc_pb.ResolveDisputeRequest, grpc_pb.ResolveDisputeReply>;
+    methodDescriptorResolveDispute: grpcWeb.MethodDescriptor<grpc_pb.ResolveDisputeRequest, grpc_pb.ResolveDisputeReply>;
     resolveDispute(request: grpc_pb.ResolveDisputeRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.ResolveDisputeReply>;
     resolveDispute(request: grpc_pb.ResolveDisputeRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.ResolveDisputeReply) => void): grpcWeb.ClientReadableStream<grpc_pb.ResolveDisputeReply>;
-    methodInfoSendDisputeChatMessage: grpcWeb.MethodDescriptor<grpc_pb.SendDisputeChatMessageRequest, grpc_pb.SendDisputeChatMessageReply>;
+    methodDescriptorSendDisputeChatMessage: grpcWeb.MethodDescriptor<grpc_pb.SendDisputeChatMessageRequest, grpc_pb.SendDisputeChatMessageReply>;
     sendDisputeChatMessage(request: grpc_pb.SendDisputeChatMessageRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.SendDisputeChatMessageReply>;
     sendDisputeChatMessage(request: grpc_pb.SendDisputeChatMessageRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.SendDisputeChatMessageReply) => void): grpcWeb.ClientReadableStream<grpc_pb.SendDisputeChatMessageReply>;
 }
@@ -129,9 +129,12 @@ export declare class DisputeAgentsClient {
     }, options?: null | {
         [index: string]: any;
     });
-    methodInfoRegisterDisputeAgent: grpcWeb.MethodDescriptor<grpc_pb.RegisterDisputeAgentRequest, grpc_pb.RegisterDisputeAgentReply>;
+    methodDescriptorRegisterDisputeAgent: grpcWeb.MethodDescriptor<grpc_pb.RegisterDisputeAgentRequest, grpc_pb.RegisterDisputeAgentReply>;
     registerDisputeAgent(request: grpc_pb.RegisterDisputeAgentRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.RegisterDisputeAgentReply>;
     registerDisputeAgent(request: grpc_pb.RegisterDisputeAgentRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.RegisterDisputeAgentReply) => void): grpcWeb.ClientReadableStream<grpc_pb.RegisterDisputeAgentReply>;
+    methodDescriptorUnregisterDisputeAgent: grpcWeb.MethodDescriptor<grpc_pb.UnregisterDisputeAgentRequest, grpc_pb.UnregisterDisputeAgentReply>;
+    unregisterDisputeAgent(request: grpc_pb.UnregisterDisputeAgentRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.UnregisterDisputeAgentReply>;
+    unregisterDisputeAgent(request: grpc_pb.UnregisterDisputeAgentRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.UnregisterDisputeAgentReply) => void): grpcWeb.ClientReadableStream<grpc_pb.UnregisterDisputeAgentReply>;
 }
 export declare class NotificationsClient {
     client_: grpcWeb.AbstractClientBase;
@@ -147,9 +150,9 @@ export declare class NotificationsClient {
     }, options?: null | {
         [index: string]: any;
     });
-    methodInfoRegisterNotificationListener: grpcWeb.MethodDescriptor<grpc_pb.RegisterNotificationListenerRequest, grpc_pb.NotificationMessage>;
+    methodDescriptorRegisterNotificationListener: grpcWeb.MethodDescriptor<grpc_pb.RegisterNotificationListenerRequest, grpc_pb.NotificationMessage>;
     registerNotificationListener(request: grpc_pb.RegisterNotificationListenerRequest, metadata?: grpcWeb.Metadata): grpcWeb.ClientReadableStream<grpc_pb.NotificationMessage>;
-    methodInfoSendNotification: grpcWeb.MethodDescriptor<grpc_pb.SendNotificationRequest, grpc_pb.SendNotificationReply>;
+    methodDescriptorSendNotification: grpcWeb.MethodDescriptor<grpc_pb.SendNotificationRequest, grpc_pb.SendNotificationReply>;
     sendNotification(request: grpc_pb.SendNotificationRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.SendNotificationReply>;
     sendNotification(request: grpc_pb.SendNotificationRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.SendNotificationReply) => void): grpcWeb.ClientReadableStream<grpc_pb.SendNotificationReply>;
 }
@@ -167,37 +170,37 @@ export declare class MoneroConnectionsClient {
     }, options?: null | {
         [index: string]: any;
     });
-    methodInfoAddConnection: grpcWeb.MethodDescriptor<grpc_pb.AddConnectionRequest, grpc_pb.AddConnectionReply>;
+    methodDescriptorAddConnection: grpcWeb.MethodDescriptor<grpc_pb.AddConnectionRequest, grpc_pb.AddConnectionReply>;
     addConnection(request: grpc_pb.AddConnectionRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.AddConnectionReply>;
     addConnection(request: grpc_pb.AddConnectionRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.AddConnectionReply) => void): grpcWeb.ClientReadableStream<grpc_pb.AddConnectionReply>;
-    methodInfoRemoveConnection: grpcWeb.MethodDescriptor<grpc_pb.RemoveConnectionRequest, grpc_pb.RemoveConnectionReply>;
+    methodDescriptorRemoveConnection: grpcWeb.MethodDescriptor<grpc_pb.RemoveConnectionRequest, grpc_pb.RemoveConnectionReply>;
     removeConnection(request: grpc_pb.RemoveConnectionRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.RemoveConnectionReply>;
     removeConnection(request: grpc_pb.RemoveConnectionRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.RemoveConnectionReply) => void): grpcWeb.ClientReadableStream<grpc_pb.RemoveConnectionReply>;
-    methodInfoGetConnection: grpcWeb.MethodDescriptor<grpc_pb.GetConnectionRequest, grpc_pb.GetConnectionReply>;
+    methodDescriptorGetConnection: grpcWeb.MethodDescriptor<grpc_pb.GetConnectionRequest, grpc_pb.GetConnectionReply>;
     getConnection(request: grpc_pb.GetConnectionRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetConnectionReply>;
     getConnection(request: grpc_pb.GetConnectionRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetConnectionReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetConnectionReply>;
-    methodInfoGetConnections: grpcWeb.MethodDescriptor<grpc_pb.GetConnectionsRequest, grpc_pb.GetConnectionsReply>;
+    methodDescriptorGetConnections: grpcWeb.MethodDescriptor<grpc_pb.GetConnectionsRequest, grpc_pb.GetConnectionsReply>;
     getConnections(request: grpc_pb.GetConnectionsRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetConnectionsReply>;
     getConnections(request: grpc_pb.GetConnectionsRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetConnectionsReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetConnectionsReply>;
-    methodInfoSetConnection: grpcWeb.MethodDescriptor<grpc_pb.SetConnectionRequest, grpc_pb.SetConnectionReply>;
+    methodDescriptorSetConnection: grpcWeb.MethodDescriptor<grpc_pb.SetConnectionRequest, grpc_pb.SetConnectionReply>;
     setConnection(request: grpc_pb.SetConnectionRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.SetConnectionReply>;
     setConnection(request: grpc_pb.SetConnectionRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.SetConnectionReply) => void): grpcWeb.ClientReadableStream<grpc_pb.SetConnectionReply>;
-    methodInfoCheckConnection: grpcWeb.MethodDescriptor<grpc_pb.CheckConnectionRequest, grpc_pb.CheckConnectionReply>;
+    methodDescriptorCheckConnection: grpcWeb.MethodDescriptor<grpc_pb.CheckConnectionRequest, grpc_pb.CheckConnectionReply>;
     checkConnection(request: grpc_pb.CheckConnectionRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.CheckConnectionReply>;
     checkConnection(request: grpc_pb.CheckConnectionRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.CheckConnectionReply) => void): grpcWeb.ClientReadableStream<grpc_pb.CheckConnectionReply>;
-    methodInfoCheckConnections: grpcWeb.MethodDescriptor<grpc_pb.CheckConnectionsRequest, grpc_pb.CheckConnectionsReply>;
+    methodDescriptorCheckConnections: grpcWeb.MethodDescriptor<grpc_pb.CheckConnectionsRequest, grpc_pb.CheckConnectionsReply>;
     checkConnections(request: grpc_pb.CheckConnectionsRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.CheckConnectionsReply>;
     checkConnections(request: grpc_pb.CheckConnectionsRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.CheckConnectionsReply) => void): grpcWeb.ClientReadableStream<grpc_pb.CheckConnectionsReply>;
-    methodInfoStartCheckingConnections: grpcWeb.MethodDescriptor<grpc_pb.StartCheckingConnectionsRequest, grpc_pb.StartCheckingConnectionsReply>;
+    methodDescriptorStartCheckingConnections: grpcWeb.MethodDescriptor<grpc_pb.StartCheckingConnectionsRequest, grpc_pb.StartCheckingConnectionsReply>;
     startCheckingConnections(request: grpc_pb.StartCheckingConnectionsRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.StartCheckingConnectionsReply>;
     startCheckingConnections(request: grpc_pb.StartCheckingConnectionsRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.StartCheckingConnectionsReply) => void): grpcWeb.ClientReadableStream<grpc_pb.StartCheckingConnectionsReply>;
-    methodInfoStopCheckingConnections: grpcWeb.MethodDescriptor<grpc_pb.StopCheckingConnectionsRequest, grpc_pb.StopCheckingConnectionsReply>;
+    methodDescriptorStopCheckingConnections: grpcWeb.MethodDescriptor<grpc_pb.StopCheckingConnectionsRequest, grpc_pb.StopCheckingConnectionsReply>;
     stopCheckingConnections(request: grpc_pb.StopCheckingConnectionsRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.StopCheckingConnectionsReply>;
     stopCheckingConnections(request: grpc_pb.StopCheckingConnectionsRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.StopCheckingConnectionsReply) => void): grpcWeb.ClientReadableStream<grpc_pb.StopCheckingConnectionsReply>;
-    methodInfoGetBestAvailableConnection: grpcWeb.MethodDescriptor<grpc_pb.GetBestAvailableConnectionRequest, grpc_pb.GetBestAvailableConnectionReply>;
+    methodDescriptorGetBestAvailableConnection: grpcWeb.MethodDescriptor<grpc_pb.GetBestAvailableConnectionRequest, grpc_pb.GetBestAvailableConnectionReply>;
     getBestAvailableConnection(request: grpc_pb.GetBestAvailableConnectionRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetBestAvailableConnectionReply>;
     getBestAvailableConnection(request: grpc_pb.GetBestAvailableConnectionRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetBestAvailableConnectionReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetBestAvailableConnectionReply>;
-    methodInfoSetAutoSwitch: grpcWeb.MethodDescriptor<grpc_pb.SetAutoSwitchRequest, grpc_pb.SetAutoSwitchReply>;
+    methodDescriptorSetAutoSwitch: grpcWeb.MethodDescriptor<grpc_pb.SetAutoSwitchRequest, grpc_pb.SetAutoSwitchReply>;
     setAutoSwitch(request: grpc_pb.SetAutoSwitchRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.SetAutoSwitchReply>;
     setAutoSwitch(request: grpc_pb.SetAutoSwitchRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.SetAutoSwitchReply) => void): grpcWeb.ClientReadableStream<grpc_pb.SetAutoSwitchReply>;
 }
@@ -215,16 +218,16 @@ export declare class MoneroNodeClient {
     }, options?: null | {
         [index: string]: any;
     });
-    methodInfoIsMoneroNodeRunning: grpcWeb.MethodDescriptor<grpc_pb.IsMoneroNodeRunningRequest, grpc_pb.IsMoneroNodeRunningReply>;
+    methodDescriptorIsMoneroNodeOnline: grpcWeb.MethodDescriptor<grpc_pb.IsMoneroNodeOnlineRequest, grpc_pb.IsMoneroNodeOnlineReply>;
-    isMoneroNodeRunning(request: grpc_pb.IsMoneroNodeRunningRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.IsMoneroNodeRunningReply>;
+    isMoneroNodeOnline(request: grpc_pb.IsMoneroNodeOnlineRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.IsMoneroNodeOnlineReply>;
-    isMoneroNodeRunning(request: grpc_pb.IsMoneroNodeRunningRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.IsMoneroNodeRunningReply) => void): grpcWeb.ClientReadableStream<grpc_pb.IsMoneroNodeRunningReply>;
+    isMoneroNodeOnline(request: grpc_pb.IsMoneroNodeOnlineRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.IsMoneroNodeOnlineReply) => void): grpcWeb.ClientReadableStream<grpc_pb.IsMoneroNodeOnlineReply>;
-    methodInfoGetMoneroNodeSettings: grpcWeb.MethodDescriptor<grpc_pb.GetMoneroNodeSettingsRequest, grpc_pb.GetMoneroNodeSettingsReply>;
+    methodDescriptorGetMoneroNodeSettings: grpcWeb.MethodDescriptor<grpc_pb.GetMoneroNodeSettingsRequest, grpc_pb.GetMoneroNodeSettingsReply>;
     getMoneroNodeSettings(request: grpc_pb.GetMoneroNodeSettingsRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetMoneroNodeSettingsReply>;
     getMoneroNodeSettings(request: grpc_pb.GetMoneroNodeSettingsRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetMoneroNodeSettingsReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetMoneroNodeSettingsReply>;
-    methodInfoStartMoneroNode: grpcWeb.MethodDescriptor<grpc_pb.StartMoneroNodeRequest, grpc_pb.StartMoneroNodeReply>;
+    methodDescriptorStartMoneroNode: grpcWeb.MethodDescriptor<grpc_pb.StartMoneroNodeRequest, grpc_pb.StartMoneroNodeReply>;
     startMoneroNode(request: grpc_pb.StartMoneroNodeRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.StartMoneroNodeReply>;
     startMoneroNode(request: grpc_pb.StartMoneroNodeRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.StartMoneroNodeReply) => void): grpcWeb.ClientReadableStream<grpc_pb.StartMoneroNodeReply>;
-    methodInfoStopMoneroNode: grpcWeb.MethodDescriptor<grpc_pb.StopMoneroNodeRequest, grpc_pb.StopMoneroNodeReply>;
+    methodDescriptorStopMoneroNode: grpcWeb.MethodDescriptor<grpc_pb.StopMoneroNodeRequest, grpc_pb.StopMoneroNodeReply>;
     stopMoneroNode(request: grpc_pb.StopMoneroNodeRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.StopMoneroNodeReply>;
     stopMoneroNode(request: grpc_pb.StopMoneroNodeRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.StopMoneroNodeReply) => void): grpcWeb.ClientReadableStream<grpc_pb.StopMoneroNodeReply>;
 }
@@ -242,22 +245,22 @@ export declare class OffersClient {
     }, options?: null | {
         [index: string]: any;
     });
-    methodInfoGetOffer: grpcWeb.MethodDescriptor<grpc_pb.GetOfferRequest, grpc_pb.GetOfferReply>;
+    methodDescriptorGetOffer: grpcWeb.MethodDescriptor<grpc_pb.GetOfferRequest, grpc_pb.GetOfferReply>;
     getOffer(request: grpc_pb.GetOfferRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetOfferReply>;
     getOffer(request: grpc_pb.GetOfferRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetOfferReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetOfferReply>;
-    methodInfoGetMyOffer: grpcWeb.MethodDescriptor<grpc_pb.GetMyOfferRequest, grpc_pb.GetMyOfferReply>;
+    methodDescriptorGetMyOffer: grpcWeb.MethodDescriptor<grpc_pb.GetMyOfferRequest, grpc_pb.GetMyOfferReply>;
     getMyOffer(request: grpc_pb.GetMyOfferRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetMyOfferReply>;
     getMyOffer(request: grpc_pb.GetMyOfferRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetMyOfferReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetMyOfferReply>;
-    methodInfoGetOffers: grpcWeb.MethodDescriptor<grpc_pb.GetOffersRequest, grpc_pb.GetOffersReply>;
+    methodDescriptorGetOffers: grpcWeb.MethodDescriptor<grpc_pb.GetOffersRequest, grpc_pb.GetOffersReply>;
     getOffers(request: grpc_pb.GetOffersRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetOffersReply>;
     getOffers(request: grpc_pb.GetOffersRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetOffersReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetOffersReply>;
-    methodInfoGetMyOffers: grpcWeb.MethodDescriptor<grpc_pb.GetMyOffersRequest, grpc_pb.GetMyOffersReply>;
+    methodDescriptorGetMyOffers: grpcWeb.MethodDescriptor<grpc_pb.GetMyOffersRequest, grpc_pb.GetMyOffersReply>;
     getMyOffers(request: grpc_pb.GetMyOffersRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetMyOffersReply>;
     getMyOffers(request: grpc_pb.GetMyOffersRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetMyOffersReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetMyOffersReply>;
-    methodInfoCreateOffer: grpcWeb.MethodDescriptor<grpc_pb.CreateOfferRequest, grpc_pb.CreateOfferReply>;
+    methodDescriptorCreateOffer: grpcWeb.MethodDescriptor<grpc_pb.CreateOfferRequest, grpc_pb.CreateOfferReply>;
     createOffer(request: grpc_pb.CreateOfferRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.CreateOfferReply>;
     createOffer(request: grpc_pb.CreateOfferRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.CreateOfferReply) => void): grpcWeb.ClientReadableStream<grpc_pb.CreateOfferReply>;
-    methodInfoCancelOffer: grpcWeb.MethodDescriptor<grpc_pb.CancelOfferRequest, grpc_pb.CancelOfferReply>;
+    methodDescriptorCancelOffer: grpcWeb.MethodDescriptor<grpc_pb.CancelOfferRequest, grpc_pb.CancelOfferReply>;
     cancelOffer(request: grpc_pb.CancelOfferRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.CancelOfferReply>;
     cancelOffer(request: grpc_pb.CancelOfferRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.CancelOfferReply) => void): grpcWeb.ClientReadableStream<grpc_pb.CancelOfferReply>;
 }
@@ -275,24 +278,30 @@ export declare class PaymentAccountsClient {
     }, options?: null | {
         [index: string]: any;
     });
-    methodInfoCreatePaymentAccount: grpcWeb.MethodDescriptor<grpc_pb.CreatePaymentAccountRequest, grpc_pb.CreatePaymentAccountReply>;
+    methodDescriptorCreatePaymentAccount: grpcWeb.MethodDescriptor<grpc_pb.CreatePaymentAccountRequest, grpc_pb.CreatePaymentAccountReply>;
     createPaymentAccount(request: grpc_pb.CreatePaymentAccountRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.CreatePaymentAccountReply>;
     createPaymentAccount(request: grpc_pb.CreatePaymentAccountRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.CreatePaymentAccountReply) => void): grpcWeb.ClientReadableStream<grpc_pb.CreatePaymentAccountReply>;
-    methodInfoGetPaymentAccounts: grpcWeb.MethodDescriptor<grpc_pb.GetPaymentAccountsRequest, grpc_pb.GetPaymentAccountsReply>;
+    methodDescriptorGetPaymentAccounts: grpcWeb.MethodDescriptor<grpc_pb.GetPaymentAccountsRequest, grpc_pb.GetPaymentAccountsReply>;
     getPaymentAccounts(request: grpc_pb.GetPaymentAccountsRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetPaymentAccountsReply>;
     getPaymentAccounts(request: grpc_pb.GetPaymentAccountsRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetPaymentAccountsReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetPaymentAccountsReply>;
-    methodInfoGetPaymentMethods: grpcWeb.MethodDescriptor<grpc_pb.GetPaymentMethodsRequest, grpc_pb.GetPaymentMethodsReply>;
+    methodDescriptorGetPaymentMethods: grpcWeb.MethodDescriptor<grpc_pb.GetPaymentMethodsRequest, grpc_pb.GetPaymentMethodsReply>;
     getPaymentMethods(request: grpc_pb.GetPaymentMethodsRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetPaymentMethodsReply>;
     getPaymentMethods(request: grpc_pb.GetPaymentMethodsRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetPaymentMethodsReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetPaymentMethodsReply>;
-    methodInfoGetPaymentAccountForm: grpcWeb.MethodDescriptor<grpc_pb.GetPaymentAccountFormRequest, grpc_pb.GetPaymentAccountFormReply>;
+    methodDescriptorGetPaymentAccountForm: grpcWeb.MethodDescriptor<grpc_pb.GetPaymentAccountFormRequest, grpc_pb.GetPaymentAccountFormReply>;
     getPaymentAccountForm(request: grpc_pb.GetPaymentAccountFormRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetPaymentAccountFormReply>;
     getPaymentAccountForm(request: grpc_pb.GetPaymentAccountFormRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetPaymentAccountFormReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetPaymentAccountFormReply>;
-    methodInfoCreateCryptoCurrencyPaymentAccount: grpcWeb.MethodDescriptor<grpc_pb.CreateCryptoCurrencyPaymentAccountRequest, grpc_pb.CreateCryptoCurrencyPaymentAccountReply>;
+    methodDescriptorGetPaymentAccountFormAsJson: grpcWeb.MethodDescriptor<grpc_pb.GetPaymentAccountFormAsJsonRequest, grpc_pb.GetPaymentAccountFormAsJsonReply>;
+    getPaymentAccountFormAsJson(request: grpc_pb.GetPaymentAccountFormAsJsonRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetPaymentAccountFormAsJsonReply>;
+    getPaymentAccountFormAsJson(request: grpc_pb.GetPaymentAccountFormAsJsonRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetPaymentAccountFormAsJsonReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetPaymentAccountFormAsJsonReply>;
+    methodDescriptorCreateCryptoCurrencyPaymentAccount: grpcWeb.MethodDescriptor<grpc_pb.CreateCryptoCurrencyPaymentAccountRequest, grpc_pb.CreateCryptoCurrencyPaymentAccountReply>;
     createCryptoCurrencyPaymentAccount(request: grpc_pb.CreateCryptoCurrencyPaymentAccountRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.CreateCryptoCurrencyPaymentAccountReply>;
     createCryptoCurrencyPaymentAccount(request: grpc_pb.CreateCryptoCurrencyPaymentAccountRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.CreateCryptoCurrencyPaymentAccountReply) => void): grpcWeb.ClientReadableStream<grpc_pb.CreateCryptoCurrencyPaymentAccountReply>;
-    methodInfoGetCryptoCurrencyPaymentMethods: grpcWeb.MethodDescriptor<grpc_pb.GetCryptoCurrencyPaymentMethodsRequest, grpc_pb.GetCryptoCurrencyPaymentMethodsReply>;
+    methodDescriptorGetCryptoCurrencyPaymentMethods: grpcWeb.MethodDescriptor<grpc_pb.GetCryptoCurrencyPaymentMethodsRequest, grpc_pb.GetCryptoCurrencyPaymentMethodsReply>;
     getCryptoCurrencyPaymentMethods(request: grpc_pb.GetCryptoCurrencyPaymentMethodsRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetCryptoCurrencyPaymentMethodsReply>;
     getCryptoCurrencyPaymentMethods(request: grpc_pb.GetCryptoCurrencyPaymentMethodsRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetCryptoCurrencyPaymentMethodsReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetCryptoCurrencyPaymentMethodsReply>;
+    methodDescriptorValidateFormField: grpcWeb.MethodDescriptor<grpc_pb.ValidateFormFieldRequest, grpc_pb.ValidateFormFieldReply>;
+    validateFormField(request: grpc_pb.ValidateFormFieldRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.ValidateFormFieldReply>;
+    validateFormField(request: grpc_pb.ValidateFormFieldRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.ValidateFormFieldReply) => void): grpcWeb.ClientReadableStream<grpc_pb.ValidateFormFieldReply>;
 }
 export declare class PriceClient {
     client_: grpcWeb.AbstractClientBase;
@@ -308,13 +317,13 @@ export declare class PriceClient {
     }, options?: null | {
         [index: string]: any;
     });
-    methodInfoGetMarketPrice: grpcWeb.MethodDescriptor<grpc_pb.MarketPriceRequest, grpc_pb.MarketPriceReply>;
+    methodDescriptorGetMarketPrice: grpcWeb.MethodDescriptor<grpc_pb.MarketPriceRequest, grpc_pb.MarketPriceReply>;
     getMarketPrice(request: grpc_pb.MarketPriceRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.MarketPriceReply>;
     getMarketPrice(request: grpc_pb.MarketPriceRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.MarketPriceReply) => void): grpcWeb.ClientReadableStream<grpc_pb.MarketPriceReply>;
-    methodInfoGetMarketPrices: grpcWeb.MethodDescriptor<grpc_pb.MarketPricesRequest, grpc_pb.MarketPricesReply>;
+    methodDescriptorGetMarketPrices: grpcWeb.MethodDescriptor<grpc_pb.MarketPricesRequest, grpc_pb.MarketPricesReply>;
     getMarketPrices(request: grpc_pb.MarketPricesRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.MarketPricesReply>;
     getMarketPrices(request: grpc_pb.MarketPricesRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.MarketPricesReply) => void): grpcWeb.ClientReadableStream<grpc_pb.MarketPricesReply>;
-    methodInfoGetMarketDepth: grpcWeb.MethodDescriptor<grpc_pb.MarketDepthRequest, grpc_pb.MarketDepthReply>;
+    methodDescriptorGetMarketDepth: grpcWeb.MethodDescriptor<grpc_pb.MarketDepthRequest, grpc_pb.MarketDepthReply>;
     getMarketDepth(request: grpc_pb.MarketDepthRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.MarketDepthReply>;
     getMarketDepth(request: grpc_pb.MarketDepthRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.MarketDepthReply) => void): grpcWeb.ClientReadableStream<grpc_pb.MarketDepthReply>;
 }
@@ -332,7 +341,7 @@ export declare class GetTradeStatisticsClient {
     }, options?: null | {
         [index: string]: any;
     });
-    methodInfoGetTradeStatistics: grpcWeb.MethodDescriptor<grpc_pb.GetTradeStatisticsRequest, grpc_pb.GetTradeStatisticsReply>;
+    methodDescriptorGetTradeStatistics: grpcWeb.MethodDescriptor<grpc_pb.GetTradeStatisticsRequest, grpc_pb.GetTradeStatisticsReply>;
     getTradeStatistics(request: grpc_pb.GetTradeStatisticsRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetTradeStatisticsReply>;
     getTradeStatistics(request: grpc_pb.GetTradeStatisticsRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetTradeStatisticsReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetTradeStatisticsReply>;
 }
@@ -350,7 +359,7 @@ export declare class ShutdownServerClient {
     }, options?: null | {
         [index: string]: any;
     });
-    methodInfoStop: grpcWeb.MethodDescriptor<grpc_pb.StopRequest, grpc_pb.StopReply>;
+    methodDescriptorStop: grpcWeb.MethodDescriptor<grpc_pb.StopRequest, grpc_pb.StopReply>;
     stop(request: grpc_pb.StopRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.StopReply>;
     stop(request: grpc_pb.StopRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.StopReply) => void): grpcWeb.ClientReadableStream<grpc_pb.StopReply>;
 }
@@ -368,31 +377,31 @@ export declare class TradesClient {
     }, options?: null | {
         [index: string]: any;
     });
-    methodInfoGetTrade: grpcWeb.MethodDescriptor<grpc_pb.GetTradeRequest, grpc_pb.GetTradeReply>;
+    methodDescriptorGetTrade: grpcWeb.MethodDescriptor<grpc_pb.GetTradeRequest, grpc_pb.GetTradeReply>;
     getTrade(request: grpc_pb.GetTradeRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetTradeReply>;
     getTrade(request: grpc_pb.GetTradeRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetTradeReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetTradeReply>;
-    methodInfoGetTrades: grpcWeb.MethodDescriptor<grpc_pb.GetTradesRequest, grpc_pb.GetTradesReply>;
+    methodDescriptorGetTrades: grpcWeb.MethodDescriptor<grpc_pb.GetTradesRequest, grpc_pb.GetTradesReply>;
     getTrades(request: grpc_pb.GetTradesRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetTradesReply>;
     getTrades(request: grpc_pb.GetTradesRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetTradesReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetTradesReply>;
-    methodInfoTakeOffer: grpcWeb.MethodDescriptor<grpc_pb.TakeOfferRequest, grpc_pb.TakeOfferReply>;
+    methodDescriptorTakeOffer: grpcWeb.MethodDescriptor<grpc_pb.TakeOfferRequest, grpc_pb.TakeOfferReply>;
     takeOffer(request: grpc_pb.TakeOfferRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.TakeOfferReply>;
     takeOffer(request: grpc_pb.TakeOfferRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.TakeOfferReply) => void): grpcWeb.ClientReadableStream<grpc_pb.TakeOfferReply>;
-    methodInfoConfirmPaymentStarted: grpcWeb.MethodDescriptor<grpc_pb.ConfirmPaymentStartedRequest, grpc_pb.ConfirmPaymentStartedReply>;
+    methodDescriptorConfirmPaymentStarted: grpcWeb.MethodDescriptor<grpc_pb.ConfirmPaymentStartedRequest, grpc_pb.ConfirmPaymentStartedReply>;
     confirmPaymentStarted(request: grpc_pb.ConfirmPaymentStartedRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.ConfirmPaymentStartedReply>;
     confirmPaymentStarted(request: grpc_pb.ConfirmPaymentStartedRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.ConfirmPaymentStartedReply) => void): grpcWeb.ClientReadableStream<grpc_pb.ConfirmPaymentStartedReply>;
-    methodInfoConfirmPaymentReceived: grpcWeb.MethodDescriptor<grpc_pb.ConfirmPaymentReceivedRequest, grpc_pb.ConfirmPaymentReceivedReply>;
+    methodDescriptorConfirmPaymentReceived: grpcWeb.MethodDescriptor<grpc_pb.ConfirmPaymentReceivedRequest, grpc_pb.ConfirmPaymentReceivedReply>;
     confirmPaymentReceived(request: grpc_pb.ConfirmPaymentReceivedRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.ConfirmPaymentReceivedReply>;
     confirmPaymentReceived(request: grpc_pb.ConfirmPaymentReceivedRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.ConfirmPaymentReceivedReply) => void): grpcWeb.ClientReadableStream<grpc_pb.ConfirmPaymentReceivedReply>;
-    methodInfoKeepFunds: grpcWeb.MethodDescriptor<grpc_pb.KeepFundsRequest, grpc_pb.KeepFundsReply>;
+    methodDescriptorKeepFunds: grpcWeb.MethodDescriptor<grpc_pb.KeepFundsRequest, grpc_pb.KeepFundsReply>;
     keepFunds(request: grpc_pb.KeepFundsRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.KeepFundsReply>;
     keepFunds(request: grpc_pb.KeepFundsRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.KeepFundsReply) => void): grpcWeb.ClientReadableStream<grpc_pb.KeepFundsReply>;
-    methodInfoWithdrawFunds: grpcWeb.MethodDescriptor<grpc_pb.WithdrawFundsRequest, grpc_pb.WithdrawFundsReply>;
+    methodDescriptorWithdrawFunds: grpcWeb.MethodDescriptor<grpc_pb.WithdrawFundsRequest, grpc_pb.WithdrawFundsReply>;
     withdrawFunds(request: grpc_pb.WithdrawFundsRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.WithdrawFundsReply>;
     withdrawFunds(request: grpc_pb.WithdrawFundsRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.WithdrawFundsReply) => void): grpcWeb.ClientReadableStream<grpc_pb.WithdrawFundsReply>;
-    methodInfoGetChatMessages: grpcWeb.MethodDescriptor<grpc_pb.GetChatMessagesRequest, grpc_pb.GetChatMessagesReply>;
+    methodDescriptorGetChatMessages: grpcWeb.MethodDescriptor<grpc_pb.GetChatMessagesRequest, grpc_pb.GetChatMessagesReply>;
     getChatMessages(request: grpc_pb.GetChatMessagesRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetChatMessagesReply>;
     getChatMessages(request: grpc_pb.GetChatMessagesRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetChatMessagesReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetChatMessagesReply>;
-    methodInfoSendChatMessage: grpcWeb.MethodDescriptor<grpc_pb.SendChatMessageRequest, grpc_pb.SendChatMessageReply>;
+    methodDescriptorSendChatMessage: grpcWeb.MethodDescriptor<grpc_pb.SendChatMessageRequest, grpc_pb.SendChatMessageReply>;
     sendChatMessage(request: grpc_pb.SendChatMessageRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.SendChatMessageReply>;
     sendChatMessage(request: grpc_pb.SendChatMessageRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.SendChatMessageReply) => void): grpcWeb.ClientReadableStream<grpc_pb.SendChatMessageReply>;
 }
@@ -410,58 +419,58 @@ export declare class WalletsClient {
     }, options?: null | {
         [index: string]: any;
     });
-    methodInfoGetBalances: grpcWeb.MethodDescriptor<grpc_pb.GetBalancesRequest, grpc_pb.GetBalancesReply>;
+    methodDescriptorGetBalances: grpcWeb.MethodDescriptor<grpc_pb.GetBalancesRequest, grpc_pb.GetBalancesReply>;
     getBalances(request: grpc_pb.GetBalancesRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetBalancesReply>;
     getBalances(request: grpc_pb.GetBalancesRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetBalancesReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetBalancesReply>;
-    methodInfoGetXmrSeed: grpcWeb.MethodDescriptor<grpc_pb.GetXmrSeedRequest, grpc_pb.GetXmrSeedReply>;
+    methodDescriptorGetXmrSeed: grpcWeb.MethodDescriptor<grpc_pb.GetXmrSeedRequest, grpc_pb.GetXmrSeedReply>;
     getXmrSeed(request: grpc_pb.GetXmrSeedRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetXmrSeedReply>;
     getXmrSeed(request: grpc_pb.GetXmrSeedRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetXmrSeedReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetXmrSeedReply>;
-    methodInfoGetXmrPrimaryAddress: grpcWeb.MethodDescriptor<grpc_pb.GetXmrPrimaryAddressRequest, grpc_pb.GetXmrPrimaryAddressReply>;
+    methodDescriptorGetXmrPrimaryAddress: grpcWeb.MethodDescriptor<grpc_pb.GetXmrPrimaryAddressRequest, grpc_pb.GetXmrPrimaryAddressReply>;
     getXmrPrimaryAddress(request: grpc_pb.GetXmrPrimaryAddressRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetXmrPrimaryAddressReply>;
     getXmrPrimaryAddress(request: grpc_pb.GetXmrPrimaryAddressRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetXmrPrimaryAddressReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetXmrPrimaryAddressReply>;
-    methodInfoGetXmrNewSubaddress: grpcWeb.MethodDescriptor<grpc_pb.GetXmrNewSubaddressRequest, grpc_pb.GetXmrNewSubaddressReply>;
+    methodDescriptorGetXmrNewSubaddress: grpcWeb.MethodDescriptor<grpc_pb.GetXmrNewSubaddressRequest, grpc_pb.GetXmrNewSubaddressReply>;
     getXmrNewSubaddress(request: grpc_pb.GetXmrNewSubaddressRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetXmrNewSubaddressReply>;
     getXmrNewSubaddress(request: grpc_pb.GetXmrNewSubaddressRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetXmrNewSubaddressReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetXmrNewSubaddressReply>;
-    methodInfoGetXmrTxs: grpcWeb.MethodDescriptor<grpc_pb.GetXmrTxsRequest, grpc_pb.GetXmrTxsReply>;
+    methodDescriptorGetXmrTxs: grpcWeb.MethodDescriptor<grpc_pb.GetXmrTxsRequest, grpc_pb.GetXmrTxsReply>;
     getXmrTxs(request: grpc_pb.GetXmrTxsRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetXmrTxsReply>;
     getXmrTxs(request: grpc_pb.GetXmrTxsRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetXmrTxsReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetXmrTxsReply>;
-    methodInfoCreateXmrTx: grpcWeb.MethodDescriptor<grpc_pb.CreateXmrTxRequest, grpc_pb.CreateXmrTxReply>;
+    methodDescriptorCreateXmrTx: grpcWeb.MethodDescriptor<grpc_pb.CreateXmrTxRequest, grpc_pb.CreateXmrTxReply>;
     createXmrTx(request: grpc_pb.CreateXmrTxRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.CreateXmrTxReply>;
     createXmrTx(request: grpc_pb.CreateXmrTxRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.CreateXmrTxReply) => void): grpcWeb.ClientReadableStream<grpc_pb.CreateXmrTxReply>;
-    methodInforelayXmrTx: grpcWeb.MethodDescriptor<grpc_pb.RelayXmrTxRequest, grpc_pb.RelayXmrTxReply>;
+    methodDescriptorrelayXmrTx: grpcWeb.MethodDescriptor<grpc_pb.RelayXmrTxRequest, grpc_pb.RelayXmrTxReply>;
     relayXmrTx(request: grpc_pb.RelayXmrTxRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.RelayXmrTxReply>;
     relayXmrTx(request: grpc_pb.RelayXmrTxRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.RelayXmrTxReply) => void): grpcWeb.ClientReadableStream<grpc_pb.RelayXmrTxReply>;
-    methodInfoGetAddressBalance: grpcWeb.MethodDescriptor<grpc_pb.GetAddressBalanceRequest, grpc_pb.GetAddressBalanceReply>;
+    methodDescriptorGetAddressBalance: grpcWeb.MethodDescriptor<grpc_pb.GetAddressBalanceRequest, grpc_pb.GetAddressBalanceReply>;
     getAddressBalance(request: grpc_pb.GetAddressBalanceRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetAddressBalanceReply>;
     getAddressBalance(request: grpc_pb.GetAddressBalanceRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetAddressBalanceReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetAddressBalanceReply>;
-    methodInfoSendBtc: grpcWeb.MethodDescriptor<grpc_pb.SendBtcRequest, grpc_pb.SendBtcReply>;
+    methodDescriptorSendBtc: grpcWeb.MethodDescriptor<grpc_pb.SendBtcRequest, grpc_pb.SendBtcReply>;
     sendBtc(request: grpc_pb.SendBtcRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.SendBtcReply>;
     sendBtc(request: grpc_pb.SendBtcRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.SendBtcReply) => void): grpcWeb.ClientReadableStream<grpc_pb.SendBtcReply>;
-    methodInfoGetTxFeeRate: grpcWeb.MethodDescriptor<grpc_pb.GetTxFeeRateRequest, grpc_pb.GetTxFeeRateReply>;
+    methodDescriptorGetTxFeeRate: grpcWeb.MethodDescriptor<grpc_pb.GetTxFeeRateRequest, grpc_pb.GetTxFeeRateReply>;
     getTxFeeRate(request: grpc_pb.GetTxFeeRateRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetTxFeeRateReply>;
     getTxFeeRate(request: grpc_pb.GetTxFeeRateRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetTxFeeRateReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetTxFeeRateReply>;
-    methodInfoSetTxFeeRatePreference: grpcWeb.MethodDescriptor<grpc_pb.SetTxFeeRatePreferenceRequest, grpc_pb.SetTxFeeRatePreferenceReply>;
+    methodDescriptorSetTxFeeRatePreference: grpcWeb.MethodDescriptor<grpc_pb.SetTxFeeRatePreferenceRequest, grpc_pb.SetTxFeeRatePreferenceReply>;
     setTxFeeRatePreference(request: grpc_pb.SetTxFeeRatePreferenceRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.SetTxFeeRatePreferenceReply>;
     setTxFeeRatePreference(request: grpc_pb.SetTxFeeRatePreferenceRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.SetTxFeeRatePreferenceReply) => void): grpcWeb.ClientReadableStream<grpc_pb.SetTxFeeRatePreferenceReply>;
-    methodInfoUnsetTxFeeRatePreference: grpcWeb.MethodDescriptor<grpc_pb.UnsetTxFeeRatePreferenceRequest, grpc_pb.UnsetTxFeeRatePreferenceReply>;
+    methodDescriptorUnsetTxFeeRatePreference: grpcWeb.MethodDescriptor<grpc_pb.UnsetTxFeeRatePreferenceRequest, grpc_pb.UnsetTxFeeRatePreferenceReply>;
     unsetTxFeeRatePreference(request: grpc_pb.UnsetTxFeeRatePreferenceRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.UnsetTxFeeRatePreferenceReply>;
     unsetTxFeeRatePreference(request: grpc_pb.UnsetTxFeeRatePreferenceRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.UnsetTxFeeRatePreferenceReply) => void): grpcWeb.ClientReadableStream<grpc_pb.UnsetTxFeeRatePreferenceReply>;
-    methodInfoGetTransaction: grpcWeb.MethodDescriptor<grpc_pb.GetTransactionRequest, grpc_pb.GetTransactionReply>;
+    methodDescriptorGetTransaction: grpcWeb.MethodDescriptor<grpc_pb.GetTransactionRequest, grpc_pb.GetTransactionReply>;
     getTransaction(request: grpc_pb.GetTransactionRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetTransactionReply>;
     getTransaction(request: grpc_pb.GetTransactionRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetTransactionReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetTransactionReply>;
-    methodInfoGetFundingAddresses: grpcWeb.MethodDescriptor<grpc_pb.GetFundingAddressesRequest, grpc_pb.GetFundingAddressesReply>;
+    methodDescriptorGetFundingAddresses: grpcWeb.MethodDescriptor<grpc_pb.GetFundingAddressesRequest, grpc_pb.GetFundingAddressesReply>;
     getFundingAddresses(request: grpc_pb.GetFundingAddressesRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.GetFundingAddressesReply>;
     getFundingAddresses(request: grpc_pb.GetFundingAddressesRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.GetFundingAddressesReply) => void): grpcWeb.ClientReadableStream<grpc_pb.GetFundingAddressesReply>;
-    methodInfoSetWalletPassword: grpcWeb.MethodDescriptor<grpc_pb.SetWalletPasswordRequest, grpc_pb.SetWalletPasswordReply>;
+    methodDescriptorSetWalletPassword: grpcWeb.MethodDescriptor<grpc_pb.SetWalletPasswordRequest, grpc_pb.SetWalletPasswordReply>;
     setWalletPassword(request: grpc_pb.SetWalletPasswordRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.SetWalletPasswordReply>;
     setWalletPassword(request: grpc_pb.SetWalletPasswordRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.SetWalletPasswordReply) => void): grpcWeb.ClientReadableStream<grpc_pb.SetWalletPasswordReply>;
-    methodInfoRemoveWalletPassword: grpcWeb.MethodDescriptor<grpc_pb.RemoveWalletPasswordRequest, grpc_pb.RemoveWalletPasswordReply>;
+    methodDescriptorRemoveWalletPassword: grpcWeb.MethodDescriptor<grpc_pb.RemoveWalletPasswordRequest, grpc_pb.RemoveWalletPasswordReply>;
     removeWalletPassword(request: grpc_pb.RemoveWalletPasswordRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.RemoveWalletPasswordReply>;
     removeWalletPassword(request: grpc_pb.RemoveWalletPasswordRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.RemoveWalletPasswordReply) => void): grpcWeb.ClientReadableStream<grpc_pb.RemoveWalletPasswordReply>;
-    methodInfoLockWallet: grpcWeb.MethodDescriptor<grpc_pb.LockWalletRequest, grpc_pb.LockWalletReply>;
+    methodDescriptorLockWallet: grpcWeb.MethodDescriptor<grpc_pb.LockWalletRequest, grpc_pb.LockWalletReply>;
     lockWallet(request: grpc_pb.LockWalletRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.LockWalletReply>;
     lockWallet(request: grpc_pb.LockWalletRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.LockWalletReply) => void): grpcWeb.ClientReadableStream<grpc_pb.LockWalletReply>;
-    methodInfoUnlockWallet: grpcWeb.MethodDescriptor<grpc_pb.UnlockWalletRequest, grpc_pb.UnlockWalletReply>;
+    methodDescriptorUnlockWallet: grpcWeb.MethodDescriptor<grpc_pb.UnlockWalletRequest, grpc_pb.UnlockWalletReply>;
     unlockWallet(request: grpc_pb.UnlockWalletRequest, metadata: grpcWeb.Metadata | null): Promise<grpc_pb.UnlockWalletReply>;
     unlockWallet(request: grpc_pb.UnlockWalletRequest, metadata: grpcWeb.Metadata | null, callback: (err: grpcWeb.RpcError, response: grpc_pb.UnlockWalletReply) => void): grpcWeb.ClientReadableStream<grpc_pb.UnlockWalletReply>;
 }

dist/protobuf/grpc_pb.d.ts

@@ -629,6 +629,38 @@ export namespace RegisterDisputeAgentReply {
   }
 }
 
+export class UnregisterDisputeAgentRequest extends jspb.Message {
+  getDisputeAgentType(): string;
+  setDisputeAgentType(value: string): UnregisterDisputeAgentRequest;
+
+  serializeBinary(): Uint8Array;
+  toObject(includeInstance?: boolean): UnregisterDisputeAgentRequest.AsObject;
+  static toObject(includeInstance: boolean, msg: UnregisterDisputeAgentRequest): UnregisterDisputeAgentRequest.AsObject;
+  static serializeBinaryToWriter(message: UnregisterDisputeAgentRequest, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): UnregisterDisputeAgentRequest;
+  static deserializeBinaryFromReader(message: UnregisterDisputeAgentRequest, reader: jspb.BinaryReader): UnregisterDisputeAgentRequest;
+}
+
+export namespace UnregisterDisputeAgentRequest {
+  export type AsObject = {
+    disputeAgentType: string,
+  }
+}
+
+export class UnregisterDisputeAgentReply extends jspb.Message {
+  serializeBinary(): Uint8Array;
+  toObject(includeInstance?: boolean): UnregisterDisputeAgentReply.AsObject;
+  static toObject(includeInstance: boolean, msg: UnregisterDisputeAgentReply): UnregisterDisputeAgentReply.AsObject;
+  static serializeBinaryToWriter(message: UnregisterDisputeAgentReply, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): UnregisterDisputeAgentReply;
+  static deserializeBinaryFromReader(message: UnregisterDisputeAgentReply, reader: jspb.BinaryReader): UnregisterDisputeAgentReply;
+}
+
+export namespace UnregisterDisputeAgentReply {
+  export type AsObject = {
+  }
+}
+
 export class RegisterNotificationListenerRequest extends jspb.Message {
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): RegisterNotificationListenerRequest.AsObject;
@@ -1146,33 +1178,33 @@ export namespace SetAutoSwitchReply {
   }
 }
 
-export class IsMoneroNodeRunningRequest extends jspb.Message {
+export class IsMoneroNodeOnlineRequest extends jspb.Message {
   serializeBinary(): Uint8Array;
-  toObject(includeInstance?: boolean): IsMoneroNodeRunningRequest.AsObject;
+  toObject(includeInstance?: boolean): IsMoneroNodeOnlineRequest.AsObject;
-  static toObject(includeInstance: boolean, msg: IsMoneroNodeRunningRequest): IsMoneroNodeRunningRequest.AsObject;
+  static toObject(includeInstance: boolean, msg: IsMoneroNodeOnlineRequest): IsMoneroNodeOnlineRequest.AsObject;
-  static serializeBinaryToWriter(message: IsMoneroNodeRunningRequest, writer: jspb.BinaryWriter): void;
+  static serializeBinaryToWriter(message: IsMoneroNodeOnlineRequest, writer: jspb.BinaryWriter): void;
-  static deserializeBinary(bytes: Uint8Array): IsMoneroNodeRunningRequest;
+  static deserializeBinary(bytes: Uint8Array): IsMoneroNodeOnlineRequest;
-  static deserializeBinaryFromReader(message: IsMoneroNodeRunningRequest, reader: jspb.BinaryReader): IsMoneroNodeRunningRequest;
+  static deserializeBinaryFromReader(message: IsMoneroNodeOnlineRequest, reader: jspb.BinaryReader): IsMoneroNodeOnlineRequest;
 }
 
-export namespace IsMoneroNodeRunningRequest {
+export namespace IsMoneroNodeOnlineRequest {
   export type AsObject = {
   }
 }
 
-export class IsMoneroNodeRunningReply extends jspb.Message {
+export class IsMoneroNodeOnlineReply extends jspb.Message {
   getIsRunning(): boolean;
-  setIsRunning(value: boolean): IsMoneroNodeRunningReply;
+  setIsRunning(value: boolean): IsMoneroNodeOnlineReply;
 
   serializeBinary(): Uint8Array;
-  toObject(includeInstance?: boolean): IsMoneroNodeRunningReply.AsObject;
+  toObject(includeInstance?: boolean): IsMoneroNodeOnlineReply.AsObject;
-  static toObject(includeInstance: boolean, msg: IsMoneroNodeRunningReply): IsMoneroNodeRunningReply.AsObject;
+  static toObject(includeInstance: boolean, msg: IsMoneroNodeOnlineReply): IsMoneroNodeOnlineReply.AsObject;
-  static serializeBinaryToWriter(message: IsMoneroNodeRunningReply, writer: jspb.BinaryWriter): void;
+  static serializeBinaryToWriter(message: IsMoneroNodeOnlineReply, writer: jspb.BinaryWriter): void;
-  static deserializeBinary(bytes: Uint8Array): IsMoneroNodeRunningReply;
+  static deserializeBinary(bytes: Uint8Array): IsMoneroNodeOnlineReply;
-  static deserializeBinaryFromReader(message: IsMoneroNodeRunningReply, reader: jspb.BinaryReader): IsMoneroNodeRunningReply;
+  static deserializeBinaryFromReader(message: IsMoneroNodeOnlineReply, reader: jspb.BinaryReader): IsMoneroNodeOnlineReply;
 }
 
-export namespace IsMoneroNodeRunningReply {
+export namespace IsMoneroNodeOnlineReply {
   export type AsObject = {
     isRunning: boolean,
   }
@@ -1625,6 +1657,9 @@ export class OfferInfo extends jspb.Message {
   getProtocolVersion(): number;
   setProtocolVersion(value: number): OfferInfo;
 
+  getArbitratorSigner(): string;
+  setArbitratorSigner(value: string): OfferInfo;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): OfferInfo.AsObject;
   static toObject(includeInstance: boolean, msg: OfferInfo): OfferInfo.AsObject;
@@ -1663,6 +1698,7 @@ export namespace OfferInfo {
     pubKeyRing: string,
     versionNr: string,
     protocolVersion: number,
+    arbitratorSigner: string,
   }
 }
 
@@ -1689,8 +1725,13 @@ export namespace AvailabilityResultWithDescription {
 }
 
 export class CreatePaymentAccountRequest extends jspb.Message {
-  getPaymentAccountForm(): string;
+  getPaymentAccountForm(): pb_pb.PaymentAccountForm | undefined;
-  setPaymentAccountForm(value: string): CreatePaymentAccountRequest;
+  setPaymentAccountForm(value?: pb_pb.PaymentAccountForm): CreatePaymentAccountRequest;
+  hasPaymentAccountForm(): boolean;
+  clearPaymentAccountForm(): CreatePaymentAccountRequest;
+
+  getPaymentAccountFormAsJson(): string;
+  setPaymentAccountFormAsJson(value: string): CreatePaymentAccountRequest;
 
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): CreatePaymentAccountRequest.AsObject;
@@ -1702,7 +1743,8 @@ export class CreatePaymentAccountRequest extends jspb.Message {
 
 export namespace CreatePaymentAccountRequest {
   export type AsObject = {
-    paymentAccountForm: string,
+    paymentAccountForm?: pb_pb.PaymentAccountForm.AsObject,
+    paymentAccountFormAsJson: string,
   }
 }
 
@@ -1813,8 +1855,10 @@ export namespace GetPaymentAccountFormRequest {
 }
 
 export class GetPaymentAccountFormReply extends jspb.Message {
-  getPaymentAccountFormJson(): string;
+  getPaymentAccountForm(): pb_pb.PaymentAccountForm | undefined;
-  setPaymentAccountFormJson(value: string): GetPaymentAccountFormReply;
+  setPaymentAccountForm(value?: pb_pb.PaymentAccountForm): GetPaymentAccountFormReply;
+  hasPaymentAccountForm(): boolean;
+  clearPaymentAccountForm(): GetPaymentAccountFormReply;
 
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): GetPaymentAccountFormReply.AsObject;
@@ -1826,7 +1870,43 @@ export class GetPaymentAccountFormReply extends jspb.Message {
 
 export namespace GetPaymentAccountFormReply {
   export type AsObject = {
-    paymentAccountFormJson: string,
+    paymentAccountForm?: pb_pb.PaymentAccountForm.AsObject,
+  }
+}
+
+export class GetPaymentAccountFormAsJsonRequest extends jspb.Message {
+  getPaymentMethodId(): string;
+  setPaymentMethodId(value: string): GetPaymentAccountFormAsJsonRequest;
+
+  serializeBinary(): Uint8Array;
+  toObject(includeInstance?: boolean): GetPaymentAccountFormAsJsonRequest.AsObject;
+  static toObject(includeInstance: boolean, msg: GetPaymentAccountFormAsJsonRequest): GetPaymentAccountFormAsJsonRequest.AsObject;
+  static serializeBinaryToWriter(message: GetPaymentAccountFormAsJsonRequest, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): GetPaymentAccountFormAsJsonRequest;
+  static deserializeBinaryFromReader(message: GetPaymentAccountFormAsJsonRequest, reader: jspb.BinaryReader): GetPaymentAccountFormAsJsonRequest;
+}
+
+export namespace GetPaymentAccountFormAsJsonRequest {
+  export type AsObject = {
+    paymentMethodId: string,
+  }
+}
+
+export class GetPaymentAccountFormAsJsonReply extends jspb.Message {
+  getPaymentAccountFormAsJson(): string;
+  setPaymentAccountFormAsJson(value: string): GetPaymentAccountFormAsJsonReply;
+
+  serializeBinary(): Uint8Array;
+  toObject(includeInstance?: boolean): GetPaymentAccountFormAsJsonReply.AsObject;
+  static toObject(includeInstance: boolean, msg: GetPaymentAccountFormAsJsonReply): GetPaymentAccountFormAsJsonReply.AsObject;
+  static serializeBinaryToWriter(message: GetPaymentAccountFormAsJsonReply, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): GetPaymentAccountFormAsJsonReply;
+  static deserializeBinaryFromReader(message: GetPaymentAccountFormAsJsonReply, reader: jspb.BinaryReader): GetPaymentAccountFormAsJsonReply;
+}
+
+export namespace GetPaymentAccountFormAsJsonReply {
+  export type AsObject = {
+    paymentAccountFormAsJson: string,
   }
 }
 
@@ -1914,6 +1994,48 @@ export namespace GetCryptoCurrencyPaymentMethodsReply {
   }
 }
 
+export class ValidateFormFieldRequest extends jspb.Message {
+  getForm(): pb_pb.PaymentAccountForm | undefined;
+  setForm(value?: pb_pb.PaymentAccountForm): ValidateFormFieldRequest;
+  hasForm(): boolean;
+  clearForm(): ValidateFormFieldRequest;
+
+  getFieldId(): pb_pb.PaymentAccountFormField.FieldId;
+  setFieldId(value: pb_pb.PaymentAccountFormField.FieldId): ValidateFormFieldRequest;
+
+  getValue(): string;
+  setValue(value: string): ValidateFormFieldRequest;
+
+  serializeBinary(): Uint8Array;
+  toObject(includeInstance?: boolean): ValidateFormFieldRequest.AsObject;
+  static toObject(includeInstance: boolean, msg: ValidateFormFieldRequest): ValidateFormFieldRequest.AsObject;
+  static serializeBinaryToWriter(message: ValidateFormFieldRequest, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): ValidateFormFieldRequest;
+  static deserializeBinaryFromReader(message: ValidateFormFieldRequest, reader: jspb.BinaryReader): ValidateFormFieldRequest;
+}
+
+export namespace ValidateFormFieldRequest {
+  export type AsObject = {
+    form?: pb_pb.PaymentAccountForm.AsObject,
+    fieldId: pb_pb.PaymentAccountFormField.FieldId,
+    value: string,
+  }
+}
+
+export class ValidateFormFieldReply extends jspb.Message {
+  serializeBinary(): Uint8Array;
+  toObject(includeInstance?: boolean): ValidateFormFieldReply.AsObject;
+  static toObject(includeInstance: boolean, msg: ValidateFormFieldReply): ValidateFormFieldReply.AsObject;
+  static serializeBinaryToWriter(message: ValidateFormFieldReply, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): ValidateFormFieldReply;
+  static deserializeBinaryFromReader(message: ValidateFormFieldReply, reader: jspb.BinaryReader): ValidateFormFieldReply;
+}
+
+export namespace ValidateFormFieldReply {
+  export type AsObject = {
+  }
+}
+
 export class MarketPriceRequest extends jspb.Message {
   getCurrencyCode(): string;
   setCurrencyCode(value: string): MarketPriceRequest;
@@ -2524,6 +2646,9 @@ export class TradeInfo extends jspb.Message {
   getPrice(): string;
   setPrice(value: string): TradeInfo;
 
+  getArbitratorNodeAddress(): string;
+  setArbitratorNodeAddress(value: string): TradeInfo;
+
   getTradingPeerNodeAddress(): string;
   setTradingPeerNodeAddress(value: string): TradeInfo;
 
@@ -2592,6 +2717,7 @@ export namespace TradeInfo {
     payoutTxId: string,
     amountAsLong: number,
     price: string,
+    arbitratorNodeAddress: string,
     tradingPeerNodeAddress: string,
     state: string,
     phase: string,
@@ -3624,11 +3750,11 @@ export class XmrBalanceInfo extends jspb.Message {
   getBalance(): string;
   setBalance(value: string): XmrBalanceInfo;
 
-  getUnlockedBalance(): string;
+  getAvailableBalance(): string;
-  setUnlockedBalance(value: string): XmrBalanceInfo;
+  setAvailableBalance(value: string): XmrBalanceInfo;
 
-  getLockedBalance(): string;
+  getPendingBalance(): string;
-  setLockedBalance(value: string): XmrBalanceInfo;
+  setPendingBalance(value: string): XmrBalanceInfo;
 
   getReservedOfferBalance(): string;
   setReservedOfferBalance(value: string): XmrBalanceInfo;
@@ -3647,8 +3773,8 @@ export class XmrBalanceInfo extends jspb.Message {
 export namespace XmrBalanceInfo {
   export type AsObject = {
     balance: string,
-    unlockedBalance: string,
+    availableBalance: string,
-    lockedBalance: string,
+    pendingBalance: string,
     reservedOfferBalance: string,
     reservedTradeBalance: string,
   }

dist/protobuf/pb_pb.d.ts

@@ -231,10 +231,15 @@ export class NetworkEnvelope extends jspb.Message {
   hasDepositResponse(): boolean;
   clearDepositResponse(): NetworkEnvelope;
 
-  getPaymentAccountPayloadRequest(): PaymentAccountPayloadRequest | undefined;
+  getPaymentAccountKeyRequest(): PaymentAccountKeyRequest | undefined;
-  setPaymentAccountPayloadRequest(value?: PaymentAccountPayloadRequest): NetworkEnvelope;
+  setPaymentAccountKeyRequest(value?: PaymentAccountKeyRequest): NetworkEnvelope;
-  hasPaymentAccountPayloadRequest(): boolean;
+  hasPaymentAccountKeyRequest(): boolean;
-  clearPaymentAccountPayloadRequest(): NetworkEnvelope;
+  clearPaymentAccountKeyRequest(): NetworkEnvelope;
+
+  getPaymentAccountKeyResponse(): PaymentAccountKeyResponse | undefined;
+  setPaymentAccountKeyResponse(value?: PaymentAccountKeyResponse): NetworkEnvelope;
+  hasPaymentAccountKeyResponse(): boolean;
+  clearPaymentAccountKeyResponse(): NetworkEnvelope;
 
   getPaymentSentMessage(): PaymentSentMessage | undefined;
   setPaymentSentMessage(value?: PaymentSentMessage): NetworkEnvelope;
@@ -251,16 +256,6 @@ export class NetworkEnvelope extends jspb.Message {
   hasPayoutTxPublishedMessage(): boolean;
   clearPayoutTxPublishedMessage(): NetworkEnvelope;
 
-  getUpdateMultisigRequest(): UpdateMultisigRequest | undefined;
-  setUpdateMultisigRequest(value?: UpdateMultisigRequest): NetworkEnvelope;
-  hasUpdateMultisigRequest(): boolean;
-  clearUpdateMultisigRequest(): NetworkEnvelope;
-
-  getUpdateMultisigResponse(): UpdateMultisigResponse | undefined;
-  setUpdateMultisigResponse(value?: UpdateMultisigResponse): NetworkEnvelope;
-  hasUpdateMultisigResponse(): boolean;
-  clearUpdateMultisigResponse(): NetworkEnvelope;
-
   getArbitratorPayoutTxRequest(): ArbitratorPayoutTxRequest | undefined;
   setArbitratorPayoutTxRequest(value?: ArbitratorPayoutTxRequest): NetworkEnvelope;
   hasArbitratorPayoutTxRequest(): boolean;
@@ -271,6 +266,16 @@ export class NetworkEnvelope extends jspb.Message {
   hasArbitratorPayoutTxResponse(): boolean;
   clearArbitratorPayoutTxResponse(): NetworkEnvelope;
 
+  getUpdateMultisigRequest(): UpdateMultisigRequest | undefined;
+  setUpdateMultisigRequest(value?: UpdateMultisigRequest): NetworkEnvelope;
+  hasUpdateMultisigRequest(): boolean;
+  clearUpdateMultisigRequest(): NetworkEnvelope;
+
+  getUpdateMultisigResponse(): UpdateMultisigResponse | undefined;
+  setUpdateMultisigResponse(value?: UpdateMultisigResponse): NetworkEnvelope;
+  hasUpdateMultisigResponse(): boolean;
+  clearUpdateMultisigResponse(): NetworkEnvelope;
+
   getMessageCase(): NetworkEnvelope.MessageCase;
 
   serializeBinary(): Uint8Array;
@@ -329,14 +334,15 @@ export namespace NetworkEnvelope {
     signContractResponse?: SignContractResponse.AsObject,
     depositRequest?: DepositRequest.AsObject,
     depositResponse?: DepositResponse.AsObject,
-    paymentAccountPayloadRequest?: PaymentAccountPayloadRequest.AsObject,
+    paymentAccountKeyRequest?: PaymentAccountKeyRequest.AsObject,
+    paymentAccountKeyResponse?: PaymentAccountKeyResponse.AsObject,
     paymentSentMessage?: PaymentSentMessage.AsObject,
     paymentReceivedMessage?: PaymentReceivedMessage.AsObject,
     payoutTxPublishedMessage?: PayoutTxPublishedMessage.AsObject,
-    updateMultisigRequest?: UpdateMultisigRequest.AsObject,
-    updateMultisigResponse?: UpdateMultisigResponse.AsObject,
     arbitratorPayoutTxRequest?: ArbitratorPayoutTxRequest.AsObject,
     arbitratorPayoutTxResponse?: ArbitratorPayoutTxResponse.AsObject,
+    updateMultisigRequest?: UpdateMultisigRequest.AsObject,
+    updateMultisigResponse?: UpdateMultisigResponse.AsObject,
   }
 
   export enum MessageCase { 
@@ -386,14 +392,15 @@ export namespace NetworkEnvelope {
     SIGN_CONTRACT_RESPONSE = 1006,
     DEPOSIT_REQUEST = 1007,
     DEPOSIT_RESPONSE = 1008,
-    PAYMENT_ACCOUNT_PAYLOAD_REQUEST = 1009,
+    PAYMENT_ACCOUNT_KEY_REQUEST = 1009,
-    PAYMENT_SENT_MESSAGE = 1010,
+    PAYMENT_ACCOUNT_KEY_RESPONSE = 1010,
-    PAYMENT_RECEIVED_MESSAGE = 1011,
+    PAYMENT_SENT_MESSAGE = 1011,
-    PAYOUT_TX_PUBLISHED_MESSAGE = 1012,
+    PAYMENT_RECEIVED_MESSAGE = 1012,
-    UPDATE_MULTISIG_REQUEST = 1013,
+    PAYOUT_TX_PUBLISHED_MESSAGE = 1013,
-    UPDATE_MULTISIG_RESPONSE = 1014,
+    ARBITRATOR_PAYOUT_TX_REQUEST = 1016,
-    ARBITRATOR_PAYOUT_TX_REQUEST = 1015,
+    ARBITRATOR_PAYOUT_TX_RESPONSE = 1017,
-    ARBITRATOR_PAYOUT_TX_RESPONSE = 1016,
+    UPDATE_MULTISIG_REQUEST = 1018,
+    UPDATE_MULTISIG_RESPONSE = 1019,
   }
 }
 
@@ -831,11 +838,6 @@ export class OfferAvailabilityResponse extends jspb.Message {
   getMakerSignature(): string;
   setMakerSignature(value: string): OfferAvailabilityResponse;
 
-  getBackupArbitrator(): NodeAddress | undefined;
-  setBackupArbitrator(value?: NodeAddress): OfferAvailabilityResponse;
-  hasBackupArbitrator(): boolean;
-  clearBackupArbitrator(): OfferAvailabilityResponse;
-
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): OfferAvailabilityResponse.AsObject;
   static toObject(includeInstance: boolean, msg: OfferAvailabilityResponse): OfferAvailabilityResponse.AsObject;
@@ -851,7 +853,6 @@ export namespace OfferAvailabilityResponse {
     supportedCapabilitiesList: Array<number>,
     uid: string,
     makerSignature: string,
-    backupArbitrator?: NodeAddress.AsObject,
   }
 }
 
@@ -1421,6 +1422,9 @@ export class InitMultisigRequest extends jspb.Message {
   getMadeMultisigHex(): string;
   setMadeMultisigHex(value: string): InitMultisigRequest;
 
+  getExchangedMultisigHex(): string;
+  setExchangedMultisigHex(value: string): InitMultisigRequest;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): InitMultisigRequest.AsObject;
   static toObject(includeInstance: boolean, msg: InitMultisigRequest): InitMultisigRequest.AsObject;
@@ -1438,6 +1442,7 @@ export namespace InitMultisigRequest {
     currentDate: number,
     preparedMultisigHex: string,
     madeMultisigHex: string,
+    exchangedMultisigHex: string,
   }
 }
 
@@ -1517,9 +1522,17 @@ export class SignContractResponse extends jspb.Message {
   getCurrentDate(): number;
   setCurrentDate(value: number): SignContractResponse;
 
+  getContractAsJson(): string;
+  setContractAsJson(value: string): SignContractResponse;
+
   getContractSignature(): string;
   setContractSignature(value: string): SignContractResponse;
 
+  getEncryptedPaymentAccountPayload(): Uint8Array | string;
+  getEncryptedPaymentAccountPayload_asU8(): Uint8Array;
+  getEncryptedPaymentAccountPayload_asB64(): string;
+  setEncryptedPaymentAccountPayload(value: Uint8Array | string): SignContractResponse;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): SignContractResponse.AsObject;
   static toObject(includeInstance: boolean, msg: SignContractResponse): SignContractResponse.AsObject;
@@ -1535,7 +1548,9 @@ export namespace SignContractResponse {
     pubKeyRing?: PubKeyRing.AsObject,
     uid: string,
     currentDate: number,
+    contractAsJson: string,
     contractSignature: string,
+    encryptedPaymentAccountPayload: Uint8Array | string,
   }
 }
 
@@ -1568,6 +1583,11 @@ export class DepositRequest extends jspb.Message {
   getDepositTxKey(): string;
   setDepositTxKey(value: string): DepositRequest;
 
+  getPaymentAccountKey(): Uint8Array | string;
+  getPaymentAccountKey_asU8(): Uint8Array;
+  getPaymentAccountKey_asB64(): string;
+  setPaymentAccountKey(value: Uint8Array | string): DepositRequest;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): DepositRequest.AsObject;
   static toObject(includeInstance: boolean, msg: DepositRequest): DepositRequest.AsObject;
@@ -1586,6 +1606,7 @@ export namespace DepositRequest {
     contractSignature: string,
     depositTxHex: string,
     depositTxKey: string,
+    paymentAccountKey: Uint8Array | string,
   }
 }
 
@@ -1627,47 +1648,81 @@ export namespace DepositResponse {
   }
 }
 
-export class PaymentAccountPayloadRequest extends jspb.Message {
+export class PaymentAccountKeyRequest extends jspb.Message {
   getTradeId(): string;
-  setTradeId(value: string): PaymentAccountPayloadRequest;
+  setTradeId(value: string): PaymentAccountKeyRequest;
 
   getSenderNodeAddress(): NodeAddress | undefined;
-  setSenderNodeAddress(value?: NodeAddress): PaymentAccountPayloadRequest;
+  setSenderNodeAddress(value?: NodeAddress): PaymentAccountKeyRequest;
   hasSenderNodeAddress(): boolean;
-  clearSenderNodeAddress(): PaymentAccountPayloadRequest;
+  clearSenderNodeAddress(): PaymentAccountKeyRequest;
 
   getPubKeyRing(): PubKeyRing | undefined;
-  setPubKeyRing(value?: PubKeyRing): PaymentAccountPayloadRequest;
+  setPubKeyRing(value?: PubKeyRing): PaymentAccountKeyRequest;
   hasPubKeyRing(): boolean;
-  clearPubKeyRing(): PaymentAccountPayloadRequest;
+  clearPubKeyRing(): PaymentAccountKeyRequest;
 
   getUid(): string;
-  setUid(value: string): PaymentAccountPayloadRequest;
+  setUid(value: string): PaymentAccountKeyRequest;
-
-  getCurrentDate(): number;
-  setCurrentDate(value: number): PaymentAccountPayloadRequest;
-
-  getPaymentAccountPayload(): PaymentAccountPayload | undefined;
-  setPaymentAccountPayload(value?: PaymentAccountPayload): PaymentAccountPayloadRequest;
-  hasPaymentAccountPayload(): boolean;
-  clearPaymentAccountPayload(): PaymentAccountPayloadRequest;
 
   serializeBinary(): Uint8Array;
-  toObject(includeInstance?: boolean): PaymentAccountPayloadRequest.AsObject;
+  toObject(includeInstance?: boolean): PaymentAccountKeyRequest.AsObject;
-  static toObject(includeInstance: boolean, msg: PaymentAccountPayloadRequest): PaymentAccountPayloadRequest.AsObject;
+  static toObject(includeInstance: boolean, msg: PaymentAccountKeyRequest): PaymentAccountKeyRequest.AsObject;
-  static serializeBinaryToWriter(message: PaymentAccountPayloadRequest, writer: jspb.BinaryWriter): void;
+  static serializeBinaryToWriter(message: PaymentAccountKeyRequest, writer: jspb.BinaryWriter): void;
-  static deserializeBinary(bytes: Uint8Array): PaymentAccountPayloadRequest;
+  static deserializeBinary(bytes: Uint8Array): PaymentAccountKeyRequest;
-  static deserializeBinaryFromReader(message: PaymentAccountPayloadRequest, reader: jspb.BinaryReader): PaymentAccountPayloadRequest;
+  static deserializeBinaryFromReader(message: PaymentAccountKeyRequest, reader: jspb.BinaryReader): PaymentAccountKeyRequest;
 }
 
-export namespace PaymentAccountPayloadRequest {
+export namespace PaymentAccountKeyRequest {
   export type AsObject = {
     tradeId: string,
     senderNodeAddress?: NodeAddress.AsObject,
     pubKeyRing?: PubKeyRing.AsObject,
     uid: string,
-    currentDate: number,
+  }
-    paymentAccountPayload?: PaymentAccountPayload.AsObject,
+}
+
+export class PaymentAccountKeyResponse extends jspb.Message {
+  getTradeId(): string;
+  setTradeId(value: string): PaymentAccountKeyResponse;
+
+  getSenderNodeAddress(): NodeAddress | undefined;
+  setSenderNodeAddress(value?: NodeAddress): PaymentAccountKeyResponse;
+  hasSenderNodeAddress(): boolean;
+  clearSenderNodeAddress(): PaymentAccountKeyResponse;
+
+  getPubKeyRing(): PubKeyRing | undefined;
+  setPubKeyRing(value?: PubKeyRing): PaymentAccountKeyResponse;
+  hasPubKeyRing(): boolean;
+  clearPubKeyRing(): PaymentAccountKeyResponse;
+
+  getUid(): string;
+  setUid(value: string): PaymentAccountKeyResponse;
+
+  getPaymentAccountKey(): Uint8Array | string;
+  getPaymentAccountKey_asU8(): Uint8Array;
+  getPaymentAccountKey_asB64(): string;
+  setPaymentAccountKey(value: Uint8Array | string): PaymentAccountKeyResponse;
+
+  getUpdatedMultisigHex(): string;
+  setUpdatedMultisigHex(value: string): PaymentAccountKeyResponse;
+
+  serializeBinary(): Uint8Array;
+  toObject(includeInstance?: boolean): PaymentAccountKeyResponse.AsObject;
+  static toObject(includeInstance: boolean, msg: PaymentAccountKeyResponse): PaymentAccountKeyResponse.AsObject;
+  static serializeBinaryToWriter(message: PaymentAccountKeyResponse, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): PaymentAccountKeyResponse;
+  static deserializeBinaryFromReader(message: PaymentAccountKeyResponse, reader: jspb.BinaryReader): PaymentAccountKeyResponse;
+}
+
+export namespace PaymentAccountKeyResponse {
+  export type AsObject = {
+    tradeId: string,
+    senderNodeAddress?: NodeAddress.AsObject,
+    pubKeyRing?: PubKeyRing.AsObject,
+    uid: string,
+    paymentAccountKey: Uint8Array | string,
+    updatedMultisigHex: string,
   }
 }
 
@@ -2016,6 +2071,11 @@ export class PaymentSentMessage extends jspb.Message {
   getUpdatedMultisigHex(): string;
   setUpdatedMultisigHex(value: string): PaymentSentMessage;
 
+  getPaymentAccountKey(): Uint8Array | string;
+  getPaymentAccountKey_asU8(): Uint8Array;
+  getPaymentAccountKey_asB64(): string;
+  setPaymentAccountKey(value: Uint8Array | string): PaymentSentMessage;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): PaymentSentMessage.AsObject;
   static toObject(includeInstance: boolean, msg: PaymentSentMessage): PaymentSentMessage.AsObject;
@@ -2034,6 +2094,7 @@ export namespace PaymentSentMessage {
     counterCurrencyExtraData: string,
     payoutTxHex: string,
     updatedMultisigHex: string,
+    paymentAccountKey: Uint8Array | string,
   }
 }
 
@@ -2084,6 +2145,9 @@ export class PayoutTxPublishedMessage extends jspb.Message {
   hasSenderNodeAddress(): boolean;
   clearSenderNodeAddress(): PayoutTxPublishedMessage;
 
+  getIsMaker(): boolean;
+  setIsMaker(value: boolean): PayoutTxPublishedMessage;
+
   getUid(): string;
   setUid(value: string): PayoutTxPublishedMessage;
 
@@ -2092,8 +2156,8 @@ export class PayoutTxPublishedMessage extends jspb.Message {
   hasSignedWitness(): boolean;
   clearSignedWitness(): PayoutTxPublishedMessage;
 
-  getPayoutTxHex(): string;
+  getSignedPayoutTxHex(): string;
-  setPayoutTxHex(value: string): PayoutTxPublishedMessage;
+  setSignedPayoutTxHex(value: string): PayoutTxPublishedMessage;
 
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): PayoutTxPublishedMessage.AsObject;
@@ -2107,9 +2171,10 @@ export namespace PayoutTxPublishedMessage {
   export type AsObject = {
     tradeId: string,
     senderNodeAddress?: NodeAddress.AsObject,
+    isMaker: boolean,
     uid: string,
     signedWitness?: SignedWitness.AsObject,
-    payoutTxHex: string,
+    signedPayoutTxHex: string,
   }
 }
 
@@ -3165,13 +3230,8 @@ export class Arbitrator extends jspb.Message {
   hasPubKeyRing(): boolean;
   clearPubKeyRing(): Arbitrator;
 
-  getBtcPubKey(): Uint8Array | string;
+  getXmrAddress(): string;
-  getBtcPubKey_asU8(): Uint8Array;
+  setXmrAddress(value: string): Arbitrator;
-  getBtcPubKey_asB64(): string;
-  setBtcPubKey(value: Uint8Array | string): Arbitrator;
-
-  getBtcAddress(): string;
-  setBtcAddress(value: string): Arbitrator;
 
   getEmailAddress(): string;
   setEmailAddress(value: string): Arbitrator;
@@ -3198,8 +3258,7 @@ export namespace Arbitrator {
     registrationSignature: string,
     registrationPubKey: Uint8Array | string,
     pubKeyRing?: PubKeyRing.AsObject,
-    btcPubKey: Uint8Array | string,
+    xmrAddress: string,
-    btcAddress: string,
     emailAddress: string,
     info: string,
     extraDataMap: Array<[string, string]>,
@@ -4720,8 +4779,13 @@ export namespace ClearXchangeAccountPayload {
 }
 
 export class CountryBasedPaymentAccountPayload extends jspb.Message {
-  getCountrycode(): string;
+  getCountryCode(): string;
-  setCountrycode(value: string): CountryBasedPaymentAccountPayload;
+  setCountryCode(value: string): CountryBasedPaymentAccountPayload;
+
+  getAcceptedCountryCodesList(): Array<string>;
+  setAcceptedCountryCodesList(value: Array<string>): CountryBasedPaymentAccountPayload;
+  clearAcceptedCountryCodesList(): CountryBasedPaymentAccountPayload;
+  addAcceptedCountryCodes(value: string, index?: number): CountryBasedPaymentAccountPayload;
 
   getBankAccountPayload(): BankAccountPayload | undefined;
   setBankAccountPayload(value?: BankAccountPayload): CountryBasedPaymentAccountPayload;
@@ -4803,6 +4867,11 @@ export class CountryBasedPaymentAccountPayload extends jspb.Message {
   hasTransferwiseUsdAccountPayload(): boolean;
   clearTransferwiseUsdAccountPayload(): CountryBasedPaymentAccountPayload;
 
+  getSwiftAccountPayload(): SwiftAccountPayload | undefined;
+  setSwiftAccountPayload(value?: SwiftAccountPayload): CountryBasedPaymentAccountPayload;
+  hasSwiftAccountPayload(): boolean;
+  clearSwiftAccountPayload(): CountryBasedPaymentAccountPayload;
+
   getMessageCase(): CountryBasedPaymentAccountPayload.MessageCase;
 
   serializeBinary(): Uint8Array;
@@ -4815,7 +4884,8 @@ export class CountryBasedPaymentAccountPayload extends jspb.Message {
 
 export namespace CountryBasedPaymentAccountPayload {
   export type AsObject = {
-    countrycode: string,
+    countryCode: string,
+    acceptedCountryCodesList: Array<string>,
     bankAccountPayload?: BankAccountPayload.AsObject,
     cashDepositAccountPayload?: CashDepositAccountPayload.AsObject,
     sepaAccountPayload?: SepaAccountPayload.AsObject,
@@ -4832,16 +4902,17 @@ export namespace CountryBasedPaymentAccountPayload {
     strikeAccountPayload?: StrikeAccountPayload.AsObject,
     tikkieAccountPayload?: TikkieAccountPayload.AsObject,
     transferwiseUsdAccountPayload?: TransferwiseUsdAccountPayload.AsObject,
+    swiftAccountPayload?: SwiftAccountPayload.AsObject,
   }
 
   export enum MessageCase { 
     MESSAGE_NOT_SET = 0,
-    BANK_ACCOUNT_PAYLOAD = 2,
+    BANK_ACCOUNT_PAYLOAD = 3,
-    CASH_DEPOSIT_ACCOUNT_PAYLOAD = 3,
+    CASH_DEPOSIT_ACCOUNT_PAYLOAD = 4,
-    SEPA_ACCOUNT_PAYLOAD = 4,
+    SEPA_ACCOUNT_PAYLOAD = 5,
-    WESTERN_UNION_ACCOUNT_PAYLOAD = 5,
+    WESTERN_UNION_ACCOUNT_PAYLOAD = 6,
-    SEPA_INSTANT_ACCOUNT_PAYLOAD = 6,
+    SEPA_INSTANT_ACCOUNT_PAYLOAD = 7,
-    F2F_ACCOUNT_PAYLOAD = 7,
+    F2F_ACCOUNT_PAYLOAD = 8,
     UPI_ACCOUNT_PAYLOAD = 9,
     PAYTM_ACCOUNT_PAYLOAD = 10,
     IFSC_BASED_ACCOUNT_PAYLOAD = 11,
@@ -4852,6 +4923,7 @@ export namespace CountryBasedPaymentAccountPayload {
     STRIKE_ACCOUNT_PAYLOAD = 16,
     TIKKIE_ACCOUNT_PAYLOAD = 17,
     TRANSFERWISE_USD_ACCOUNT_PAYLOAD = 18,
+    SWIFT_ACCOUNT_PAYLOAD = 19,
   }
 }
 
@@ -5261,11 +5333,6 @@ export class SepaAccountPayload extends jspb.Message {
   getEmail(): string;
   setEmail(value: string): SepaAccountPayload;
 
-  getAcceptedCountryCodesList(): Array<string>;
-  setAcceptedCountryCodesList(value: Array<string>): SepaAccountPayload;
-  clearAcceptedCountryCodesList(): SepaAccountPayload;
-  addAcceptedCountryCodes(value: string, index?: number): SepaAccountPayload;
-
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): SepaAccountPayload.AsObject;
   static toObject(includeInstance: boolean, msg: SepaAccountPayload): SepaAccountPayload.AsObject;
@@ -5280,7 +5347,6 @@ export namespace SepaAccountPayload {
     iban: string,
     bic: string,
     email: string,
-    acceptedCountryCodesList: Array<string>,
   }
 }
 
@@ -5294,11 +5360,6 @@ export class SepaInstantAccountPayload extends jspb.Message {
   getBic(): string;
   setBic(value: string): SepaInstantAccountPayload;
 
-  getAcceptedCountryCodesList(): Array<string>;
-  setAcceptedCountryCodesList(value: Array<string>): SepaInstantAccountPayload;
-  clearAcceptedCountryCodesList(): SepaInstantAccountPayload;
-  addAcceptedCountryCodes(value: string, index?: number): SepaInstantAccountPayload;
-
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): SepaInstantAccountPayload.AsObject;
   static toObject(includeInstance: boolean, msg: SepaInstantAccountPayload): SepaInstantAccountPayload.AsObject;
@@ -5312,7 +5373,6 @@ export namespace SepaInstantAccountPayload {
     holderName: string,
     iban: string,
     bic: string,
-    acceptedCountryCodesList: Array<string>,
   }
 }
 
@@ -5353,15 +5413,15 @@ export namespace InstantCryptoCurrencyAccountPayload {
 }
 
 export class FasterPaymentsAccountPayload extends jspb.Message {
+  getHolderName(): string;
+  setHolderName(value: string): FasterPaymentsAccountPayload;
+
   getSortCode(): string;
   setSortCode(value: string): FasterPaymentsAccountPayload;
 
   getAccountNr(): string;
   setAccountNr(value: string): FasterPaymentsAccountPayload;
 
-  getEmail(): string;
-  setEmail(value: string): FasterPaymentsAccountPayload;
-
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): FasterPaymentsAccountPayload.AsObject;
   static toObject(includeInstance: boolean, msg: FasterPaymentsAccountPayload): FasterPaymentsAccountPayload.AsObject;
@@ -5372,9 +5432,9 @@ export class FasterPaymentsAccountPayload extends jspb.Message {
 
 export namespace FasterPaymentsAccountPayload {
   export type AsObject = {
+    holderName: string,
     sortCode: string,
     accountNr: string,
-    email: string,
   }
 }
 
@@ -6842,11 +6902,6 @@ export class OpenOffer extends jspb.Message {
   getState(): OpenOffer.State;
   setState(value: OpenOffer.State): OpenOffer;
 
-  getBackupArbitrator(): NodeAddress | undefined;
-  setBackupArbitrator(value?: NodeAddress): OpenOffer;
-  hasBackupArbitrator(): boolean;
-  clearBackupArbitrator(): OpenOffer;
-
   getTriggerPrice(): number;
   setTriggerPrice(value: number): OpenOffer;
 
@@ -6882,7 +6937,6 @@ export namespace OpenOffer {
   export type AsObject = {
     offer?: Offer.AsObject,
     state: OpenOffer.State,
-    backupArbitrator?: NodeAddress.AsObject,
     triggerPrice: number,
     autoSplit: boolean,
     scheduledTxHashesList: Array<string>,
@@ -7174,55 +7228,53 @@ export namespace Trade {
   export enum State { 
     PB_ERROR_STATE = 0,
     PREPARATION = 1,
-    CONTRACT_SIGNATURE_REQUESTED = 2,
+    MULTISIG_PREPARED = 2,
-    CONTRACT_SIGNED = 3,
+    MULTISIG_MADE = 3,
-    TAKER_PUBLISHED_TAKER_FEE_TX = 4,
+    MULTISIG_EXCHANGED = 4,
-    MAKER_SENT_PUBLISH_DEPOSIT_TX_REQUEST = 5,
+    MULTISIG_COMPLETED = 5,
-    MAKER_SAW_ARRIVED_PUBLISH_DEPOSIT_TX_REQUEST = 6,
+    CONTRACT_SIGNATURE_REQUESTED = 6,
-    MAKER_STORED_IN_MAILBOX_PUBLISH_DEPOSIT_TX_REQUEST = 7,
+    CONTRACT_SIGNED = 7,
-    MAKER_SEND_FAILED_PUBLISH_DEPOSIT_TX_REQUEST = 8,
+    SENT_PUBLISH_DEPOSIT_TX_REQUEST = 8,
-    TAKER_RECEIVED_PUBLISH_DEPOSIT_TX_REQUEST = 9,
+    SAW_ARRIVED_PUBLISH_DEPOSIT_TX_REQUEST = 9,
-    TAKER_PUBLISHED_DEPOSIT_TX = 10,
+    STORED_IN_MAILBOX_PUBLISH_DEPOSIT_TX_REQUEST = 10,
-    TAKER_SAW_DEPOSIT_TX_IN_NETWORK = 11,
+    SEND_FAILED_PUBLISH_DEPOSIT_TX_REQUEST = 11,
-    TAKER_SENT_DEPOSIT_TX_PUBLISHED_MSG = 12,
+    ARBITRATOR_PUBLISHED_DEPOSIT_TXS = 12,
-    TAKER_SAW_ARRIVED_DEPOSIT_TX_PUBLISHED_MSG = 13,
+    DEPOSIT_TXS_SEEN_IN_BLOCKCHAIN = 13,
-    TAKER_STORED_IN_MAILBOX_DEPOSIT_TX_PUBLISHED_MSG = 14,
+    DEPOSIT_TXS_CONFIRMED_IN_BLOCKCHAIN = 14,
-    TAKER_SEND_FAILED_DEPOSIT_TX_PUBLISHED_MSG = 15,
+    DEPOSIT_TXS_UNLOCKED_IN_BLOCKCHAIN = 15,
-    MAKER_RECEIVED_DEPOSIT_TX_PUBLISHED_MSG = 16,
+    BUYER_CONFIRMED_IN_UI_PAYMENT_SENT = 16,
-    MAKER_SAW_DEPOSIT_TX_IN_NETWORK = 17,
+    BUYER_SENT_PAYMENT_SENT_MSG = 17,
-    DEPOSIT_UNLOCKED_IN_BLOCK_CHAIN = 18,
+    BUYER_SAW_ARRIVED_PAYMENT_SENT_MSG = 18,
-    BUYER_CONFIRMED_IN_UI_PAYMENT_SENT = 19,
+    BUYER_STORED_IN_MAILBOX_PAYMENT_SENT_MSG = 19,
-    BUYER_SENT_PAYMENT_SENT_MSG = 20,
+    BUYER_SEND_FAILED_PAYMENT_SENT_MSG = 20,
-    BUYER_SAW_ARRIVED_PAYMENT_SENT_MSG = 21,
+    SELLER_RECEIVED_PAYMENT_SENT_MSG = 21,
-    BUYER_STORED_IN_MAILBOX_PAYMENT_SENT_MSG = 22,
+    SELLER_CONFIRMED_IN_UI_PAYMENT_RECEIPT = 22,
-    BUYER_SEND_FAILED_PAYMENT_SENT_MSG = 23,
+    SELLER_SENT_PAYMENT_RECEIVED_MSG = 23,
-    SELLER_RECEIVED_PAYMENT_SENT_MSG = 24,
+    SELLER_SAW_ARRIVED_PAYMENT_RECEIVED_MSG = 24,
-    SELLER_CONFIRMED_IN_UI_PAYMENT_RECEIPT = 25,
+    SELLER_STORED_IN_MAILBOX_PAYMENT_RECEIVED_MSG = 25,
-    SELLER_SENT_PAYMENT_RECEIVED_MSG = 26,
+    SELLER_SEND_FAILED_PAYMENT_RECEIVED_MSG = 26,
-    SELLER_SAW_ARRIVED_PAYMENT_RECEIVED_MSG = 27,
+    SELLER_PUBLISHED_PAYOUT_TX = 27,
-    SELLER_STORED_IN_MAILBOX_PAYMENT_RECEIVED_MSG = 28,
+    SELLER_SENT_PAYOUT_TX_PUBLISHED_MSG = 28,
-    SELLER_SEND_FAILED_PAYMENT_RECEIVED_MSG = 29,
+    SELLER_SAW_ARRIVED_PAYOUT_TX_PUBLISHED_MSG = 29,
-    SELLER_PUBLISHED_PAYOUT_TX = 30,
+    SELLER_STORED_IN_MAILBOX_PAYOUT_TX_PUBLISHED_MSG = 30,
-    SELLER_SENT_PAYOUT_TX_PUBLISHED_MSG = 31,
+    SELLER_SEND_FAILED_PAYOUT_TX_PUBLISHED_MSG = 31,
-    SELLER_SAW_ARRIVED_PAYOUT_TX_PUBLISHED_MSG = 32,
+    BUYER_RECEIVED_PAYOUT_TX_PUBLISHED_MSG = 32,
-    SELLER_STORED_IN_MAILBOX_PAYOUT_TX_PUBLISHED_MSG = 33,
+    BUYER_SAW_PAYOUT_TX_IN_NETWORK = 33,
-    SELLER_SEND_FAILED_PAYOUT_TX_PUBLISHED_MSG = 34,
+    BUYER_PUBLISHED_PAYOUT_TX = 34,
-    BUYER_RECEIVED_PAYOUT_TX_PUBLISHED_MSG = 35,
+    WITHDRAW_COMPLETED = 35,
-    BUYER_SAW_PAYOUT_TX_IN_NETWORK = 36,
-    BUYER_PUBLISHED_PAYOUT_TX = 37,
-    WITHDRAW_COMPLETED = 38,
   }
 
   export enum Phase { 
     PB_ERROR_PHASE = 0,
     INIT = 1,
-    TAKER_FEE_PUBLISHED = 2,
+    DEPOSIT_REQUESTED = 2,
-    DEPOSIT_PUBLISHED = 3,
+    DEPOSITS_PUBLISHED = 3,
-    DEPOSIT_CONFIRMED = 4,
+    DEPOSITS_CONFIRMED = 4,
-    PAYMENT_SENT = 5,
+    DEPOSITS_UNLOCKED = 5,
-    PAYMENT_RECEIVED = 6,
+    PAYMENT_SENT = 6,
-    PAYOUT_PUBLISHED = 7,
+    PAYMENT_RECEIVED = 7,
-    WITHDRAWN = 8,
+    PAYOUT_PUBLISHED = 8,
+    WITHDRAWN = 9,
   }
 
   export enum DisputeState { 
@@ -7406,11 +7458,6 @@ export class ProcessModel extends jspb.Message {
   getMakerSignature(): string;
   setMakerSignature(value: string): ProcessModel;
 
-  getBackupArbitrator(): NodeAddress | undefined;
-  setBackupArbitrator(value?: NodeAddress): ProcessModel;
-  hasBackupArbitrator(): boolean;
-  clearBackupArbitrator(): ProcessModel;
-
   getMaker(): TradingPeer | undefined;
   setMaker(value?: TradingPeer): ProcessModel;
   hasMaker(): boolean;
@@ -7431,18 +7478,9 @@ export class ProcessModel extends jspb.Message {
   hasTempTradingPeerNodeAddress(): boolean;
   clearTempTradingPeerNodeAddress(): ProcessModel;
 
-  getPreparedMultisigHex(): string;
-  setPreparedMultisigHex(value: string): ProcessModel;
-
-  getMadeMultisigHex(): string;
-  setMadeMultisigHex(value: string): ProcessModel;
-
   getMultisigAddress(): string;
   setMultisigAddress(value: string): ProcessModel;
 
-  getMultisigSetupComplete(): boolean;
-  setMultisigSetupComplete(value: boolean): ProcessModel;
-
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): ProcessModel.AsObject;
   static toObject(includeInstance: boolean, msg: ProcessModel): ProcessModel.AsObject;
@@ -7469,15 +7507,11 @@ export namespace ProcessModel {
     buyerPayoutAmountFromMediation: number,
     sellerPayoutAmountFromMediation: number,
     makerSignature: string,
-    backupArbitrator?: NodeAddress.AsObject,
     maker?: TradingPeer.AsObject,
     taker?: TradingPeer.AsObject,
     arbitrator?: TradingPeer.AsObject,
     tempTradingPeerNodeAddress?: NodeAddress.AsObject,
-    preparedMultisigHex: string,
-    madeMultisigHex: string,
     multisigAddress: string,
-    multisigSetupComplete: boolean,
   }
 }
 
@@ -7496,6 +7530,16 @@ export class TradingPeer extends jspb.Message {
   getPaymentAccountPayloadHash_asB64(): string;
   setPaymentAccountPayloadHash(value: Uint8Array | string): TradingPeer;
 
+  getEncryptedPaymentAccountPayload(): Uint8Array | string;
+  getEncryptedPaymentAccountPayload_asU8(): Uint8Array;
+  getEncryptedPaymentAccountPayload_asB64(): string;
+  setEncryptedPaymentAccountPayload(value: Uint8Array | string): TradingPeer;
+
+  getPaymentAccountKey(): Uint8Array | string;
+  getPaymentAccountKey_asU8(): Uint8Array;
+  getPaymentAccountKey_asB64(): string;
+  setPaymentAccountKey(value: Uint8Array | string): TradingPeer;
+
   getPaymentAccountPayload(): PaymentAccountPayload | undefined;
   setPaymentAccountPayload(value?: PaymentAccountPayload): TradingPeer;
   hasPaymentAccountPayload(): boolean;
@@ -7574,6 +7618,9 @@ export class TradingPeer extends jspb.Message {
   getMadeMultisigHex(): string;
   setMadeMultisigHex(value: string): TradingPeer;
 
+  getExchangedMultisigHex(): string;
+  setExchangedMultisigHex(value: string): TradingPeer;
+
   getPayoutTxHex(): string;
   setPayoutTxHex(value: string): TradingPeer;
 
@@ -7603,6 +7650,8 @@ export namespace TradingPeer {
     paymentAccountId: string,
     paymentMethodId: string,
     paymentAccountPayloadHash: Uint8Array | string,
+    encryptedPaymentAccountPayload: Uint8Array | string,
+    paymentAccountKey: Uint8Array | string,
     paymentAccountPayload?: PaymentAccountPayload.AsObject,
     payoutAddressString: string,
     contractAsJson: string,
@@ -7623,6 +7672,7 @@ export namespace TradingPeer {
     reserveTxKeyImagesList: Array<string>,
     preparedMultisigHex: string,
     madeMultisigHex: string,
+    exchangedMultisigHex: string,
     payoutTxHex: string,
     depositTxHash: string,
     depositTxHex: string,
@@ -8587,6 +8637,185 @@ export namespace MockPayload {
   }
 }
 
+export class PaymentAccountForm extends jspb.Message {
+  getId(): PaymentAccountForm.FormId;
+  setId(value: PaymentAccountForm.FormId): PaymentAccountForm;
+
+  getFieldsList(): Array<PaymentAccountFormField>;
+  setFieldsList(value: Array<PaymentAccountFormField>): PaymentAccountForm;
+  clearFieldsList(): PaymentAccountForm;
+  addFields(value?: PaymentAccountFormField, index?: number): PaymentAccountFormField;
+
+  serializeBinary(): Uint8Array;
+  toObject(includeInstance?: boolean): PaymentAccountForm.AsObject;
+  static toObject(includeInstance: boolean, msg: PaymentAccountForm): PaymentAccountForm.AsObject;
+  static serializeBinaryToWriter(message: PaymentAccountForm, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): PaymentAccountForm;
+  static deserializeBinaryFromReader(message: PaymentAccountForm, reader: jspb.BinaryReader): PaymentAccountForm;
+}
+
+export namespace PaymentAccountForm {
+  export type AsObject = {
+    id: PaymentAccountForm.FormId,
+    fieldsList: Array<PaymentAccountFormField.AsObject>,
+  }
+
+  export enum FormId { 
+    REVOLUT = 0,
+    SEPA = 1,
+    SEPA_INSTANT = 2,
+    TRANSFERWISE = 3,
+    CLEAR_X_CHANGE = 4,
+    SWIFT = 5,
+    F2F = 6,
+    STRIKE = 7,
+    MONEY_GRAM = 8,
+    FASTER_PAYMENTS = 9,
+    UPHOLD = 10,
+    PAXUM = 11,
+  }
+}
+
+export class PaymentAccountFormField extends jspb.Message {
+  getId(): PaymentAccountFormField.FieldId;
+  setId(value: PaymentAccountFormField.FieldId): PaymentAccountFormField;
+
+  getComponent(): PaymentAccountFormField.Component;
+  setComponent(value: PaymentAccountFormField.Component): PaymentAccountFormField;
+
+  getType(): string;
+  setType(value: string): PaymentAccountFormField;
+
+  getLabel(): string;
+  setLabel(value: string): PaymentAccountFormField;
+
+  getValue(): string;
+  setValue(value: string): PaymentAccountFormField;
+
+  getMinlength(): number;
+  setMinlength(value: number): PaymentAccountFormField;
+
+  getMaxlength(): number;
+  setMaxlength(value: number): PaymentAccountFormField;
+
+  getSupportedCurrenciesList(): Array<TradeCurrency>;
+  setSupportedCurrenciesList(value: Array<TradeCurrency>): PaymentAccountFormField;
+  clearSupportedCurrenciesList(): PaymentAccountFormField;
+  addSupportedCurrencies(value?: TradeCurrency, index?: number): TradeCurrency;
+
+  getSupportedCountriesList(): Array<Country>;
+  setSupportedCountriesList(value: Array<Country>): PaymentAccountFormField;
+  clearSupportedCountriesList(): PaymentAccountFormField;
+  addSupportedCountries(value?: Country, index?: number): Country;
+
+  getSupportedSepaEuroCountriesList(): Array<Country>;
+  setSupportedSepaEuroCountriesList(value: Array<Country>): PaymentAccountFormField;
+  clearSupportedSepaEuroCountriesList(): PaymentAccountFormField;
+  addSupportedSepaEuroCountries(value?: Country, index?: number): Country;
+
+  getSupportedSepaNonEuroCountriesList(): Array<Country>;
+  setSupportedSepaNonEuroCountriesList(value: Array<Country>): PaymentAccountFormField;
+  clearSupportedSepaNonEuroCountriesList(): PaymentAccountFormField;
+  addSupportedSepaNonEuroCountries(value?: Country, index?: number): Country;
+
+  getRequiredForCountriesList(): Array<string>;
+  setRequiredForCountriesList(value: Array<string>): PaymentAccountFormField;
+  clearRequiredForCountriesList(): PaymentAccountFormField;
+  addRequiredForCountries(value: string, index?: number): PaymentAccountFormField;
+
+  serializeBinary(): Uint8Array;
+  toObject(includeInstance?: boolean): PaymentAccountFormField.AsObject;
+  static toObject(includeInstance: boolean, msg: PaymentAccountFormField): PaymentAccountFormField.AsObject;
+  static serializeBinaryToWriter(message: PaymentAccountFormField, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): PaymentAccountFormField;
+  static deserializeBinaryFromReader(message: PaymentAccountFormField, reader: jspb.BinaryReader): PaymentAccountFormField;
+}
+
+export namespace PaymentAccountFormField {
+  export type AsObject = {
+    id: PaymentAccountFormField.FieldId,
+    component: PaymentAccountFormField.Component,
+    type: string,
+    label: string,
+    value: string,
+    minlength: number,
+    maxlength: number,
+    supportedCurrenciesList: Array<TradeCurrency.AsObject>,
+    supportedCountriesList: Array<Country.AsObject>,
+    supportedSepaEuroCountriesList: Array<Country.AsObject>,
+    supportedSepaNonEuroCountriesList: Array<Country.AsObject>,
+    requiredForCountriesList: Array<string>,
+  }
+
+  export enum FieldId { 
+    ACCEPTED_COUNTRY_CODES = 0,
+    ACCOUNT_ID = 1,
+    ACCOUNT_NAME = 2,
+    ACCOUNT_NR = 3,
+    ACCOUNT_OWNER = 4,
+    ACCOUNT_TYPE = 5,
+    ANSWER = 6,
+    BANK_ACCOUNT_NAME = 7,
+    BANK_ACCOUNT_NUMBER = 8,
+    BANK_ACCOUNT_TYPE = 9,
+    BANK_ADDRESS = 10,
+    BANK_BRANCH = 11,
+    BANK_BRANCH_CODE = 12,
+    BANK_BRANCH_NAME = 13,
+    BANK_CODE = 14,
+    BANK_COUNTRY_CODE = 15,
+    BANK_ID = 16,
+    BANK_NAME = 17,
+    BANK_SWIFT_CODE = 18,
+    BENEFICIARY_ACCOUNT_NR = 19,
+    BENEFICIARY_ADDRESS = 20,
+    BENEFICIARY_CITY = 21,
+    BENEFICIARY_NAME = 22,
+    BENEFICIARY_PHONE = 23,
+    BIC = 24,
+    BRANCH_ID = 25,
+    CITY = 26,
+    CONTACT = 27,
+    COUNTRY = 28,
+    EMAIL = 29,
+    EMAIL_OR_MOBILE_NR = 30,
+    EXTRA_INFO = 31,
+    HOLDER_ADDRESS = 32,
+    HOLDER_EMAIL = 33,
+    HOLDER_NAME = 34,
+    HOLDER_TAX_ID = 35,
+    IBAN = 36,
+    IFSC = 37,
+    INTERMEDIARY_ADDRESS = 38,
+    INTERMEDIARY_BRANCH = 39,
+    INTERMEDIARY_COUNTRY_CODE = 40,
+    INTERMEDIARY_NAME = 41,
+    INTERMEDIARY_SWIFT_CODE = 42,
+    MOBILE_NR = 43,
+    NATIONAL_ACCOUNT_ID = 44,
+    PAYID = 45,
+    PIX_KEY = 46,
+    POSTAL_ADDRESS = 47,
+    PROMPT_PAY_ID = 48,
+    QUESTION = 49,
+    REQUIREMENTS = 50,
+    SALT = 51,
+    SORT_CODE = 52,
+    SPECIAL_INSTRUCTIONS = 53,
+    STATE = 54,
+    TRADE_CURRENCIES = 55,
+    USER_NAME = 56,
+    VIRTUAL_PAYMENT_ADDRESS = 57,
+  }
+
+  export enum Component { 
+    TEXT = 0,
+    TEXTAREA = 1,
+    SELECT_ONE = 2,
+    SELECT_MULTIPLE = 3,
+  }
+}
+
 export enum SupportType { 
   ARBITRATION = 0,
   MEDIATION = 1,

dist/utils/HavenoUtils.d.ts

@@ -1,3 +1,4 @@
+import { PaymentAccountForm, PaymentAccountFormField } from "../protobuf/pb_pb";
 /**
  * Collection of utilities for working with Haveno.
  */
@@ -49,4 +50,21 @@ export default class HavenoUtils {
      * @return {BigInt} the amount denominated in atomic units
      */
     static centinerosToAtomicUnits(centineros: number): bigint;
+    /**
+     * Get a form field value.
+     *
+     * @param {PaymentAccountFormField.FieldId} fieldId - id of the field to get the value from
+     * @param {PaymentAccountForm} form - form to get the field value from
+     * @return {string} the form field value
+     */
+    static getFormValue(fieldId: PaymentAccountFormField.FieldId, form: PaymentAccountForm): string;
+    /**
+     * Set a form field value.
+     *
+     * @param {PaymentAccountFormField.FieldId} fieldId - id of the field to set the value of
+     * @param {string} value - field value to set
+     * @param {PaymentAccountForm} form - form to get the field from
+     * @return {string} the form field value
+     */
+    static setFormValue(fieldId: PaymentAccountFormField.FieldId, value: string, form: PaymentAccountForm): void;
 }

dist/utils/HavenoUtils.js

@@ -76,6 +76,38 @@ class HavenoUtils {
     static centinerosToAtomicUnits(centineros) {
         return BigInt(centineros) * BigInt(HavenoUtils.centinerosToAUMultiplier);
     }
+    /**
+     * Get a form field value.
+     *
+     * @param {PaymentAccountFormField.FieldId} fieldId - id of the field to get the value from
+     * @param {PaymentAccountForm} form - form to get the field value from
+     * @return {string} the form field value
+     */
+    // TODO: attach getter and setter to PaymentAccountForm prototype in typescript?
+    static getFormValue(fieldId, form) {
+        for (const field of form.getFieldsList()) {
+            if (field.getId() === fieldId)
+                return field.getValue();
+        }
+        throw new Error("PaymentAccountForm does not have field " + fieldId);
+    }
+    /**
+     * Set a form field value.
+     *
+     * @param {PaymentAccountFormField.FieldId} fieldId - id of the field to set the value of
+     * @param {string} value - field value to set
+     * @param {PaymentAccountForm} form - form to get the field from
+     * @return {string} the form field value
+     */
+    static setFormValue(fieldId, value, form) {
+        for (const field of form.getFieldsList()) {
+            if (field.getId() === fieldId) {
+                field.setValue(value);
+                return;
+            }
+        }
+        throw new Error("PaymentAccountForm does not have field " + fieldId);
+    }
 }
 exports.default = HavenoUtils;
 HavenoUtils.logLevel = 0;

dist/utils/HavenoUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"HavenoUtils.js","sourceRoot":"","sources":["../../src/utils/HavenoUtils.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAC5B,sDAA8B;AAE9B;;GAEG;AACH,MAAqB,WAAW;IAO9B;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,KAAa;QACpC,IAAA,gBAAM,EAAC,KAAK,KAAK,QAAQ,CAAC,KAAK,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,mCAAmC,CAAC,CAAC;QAC9F,WAAW,CAAC,QAAQ,GAAG,KAAK,CAAC;IAC/B,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,WAAW;QAChB,OAAO,WAAW,CAAC,QAAQ,CAAC;IAC9B,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,GAAG,CAAC,KAAa,EAAE,GAAW;QACnC,IAAA,gBAAM,EAAC,KAAK,KAAK,QAAQ,CAAC,KAAK,GAAG,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,mCAAmC,CAAC,CAAC;QAC9F,IAAI,WAAW,CAAC,QAAQ,IAAI,KAAK,EAAE;YACjC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,MAAM,yBAAyB,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,GAAG,GAAG,WAAW,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;YACxH,WAAW,CAAC,aAAa,GAAG,GAAG,CAAC;YAChC,iBAAO,CAAC,GAAG,CAAC,WAAW,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,yBAAyB,GAAG,MAAM,GAAG,KAAK,GAAG,IAAI,GAAG,GAAG,CAAC,CAAC;SACzG;IACH,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,eAAe,CAAC,SAAiB;QACtC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;QACjC,OAAO,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,GAAG,GAAG,CAAC,GAAG,GAAI,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACzO,CAAC;IAED;;;;;;;OAOG;IACH,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAY,EAAE,MAAe;QAC7C,OAAO,IAAI,OAAO,CAAC,UAAS,OAAO,EAAE,MAAM;YACzC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,cAAa,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9C,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,UAAS,GAAQ,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACzD,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACH,MAAM,CAAC,uBAAuB,CAAC,UAAkB;QAC/C,OAAO,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,wBAAwB,CAAC,CAAC;IAC3E,CAAC;;AA9EH,8BA+EC;AA7EQ,oBAAQ,GAAG,CAAC,CAAC;AACb,oCAAwB,GAAG,KAAK,CAAC;AACjC,kBAAM,GAAG,CAAC,KAAK,EAAC,KAAK,EAAC,KAAK,EAAC,KAAK,EAAC,KAAK,EAAC,KAAK,EAAC,KAAK,EAAC,KAAK,EAAC,KAAK,EAAC,KAAK,EAAC,KAAK,EAAC,KAAK,CAAC,CAAC;AACnF,yBAAa,GAAG,CAAC,CAAC"}
+{"version":3,"file":"HavenoUtils.js","sourceRoot":"","sources":["../../src/utils/HavenoUtils.ts"],"names":[],"mappings":"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"}