Rebased

Author: rsercano

docs/api.md

@@ -23,6 +23,16 @@ const LevelPriorities = {
   trace: 6,
 };
 
+enum LevelPriority {
+  alert,
+  error,
+  warn,
+  info,
+  verbose,
+  debug,
+  trace,
+}
+
 export enum Context {
   Global = 'GLOBAL',
   DB = 'DB',
@@ -138,6 +148,12 @@ class Logger {
     });
   }
 
+  public setLogLevel = (level: Level) => {
+    this.logger?.transports.forEach((transport) => {
+      transport.level = level;
+    });
+  }
+
   private getLogFormat = (colorize: boolean, dateFormat?: string) => {
     const { format } = winston;
 
@@ -219,4 +235,4 @@ class Logger {
 }
 
 export default Logger;
-export { Level, Loggers };
+export { Level, Loggers, LevelPriority };

lib/Logger.ts

@@ -213,6 +213,13 @@ class Xud extends EventEmitter {
         shutdown: this.beginShutdown,
       });
 
+      this.service.on('logLevel', (level) => {
+        this.swapClientManager?.setLogLevel(level);
+        Object.values(loggers).forEach((logger) => {
+          logger.setLogLevel(level);
+        });
+      });
+
       if (this.swapClientManager.connextClient?.isOperational()) {
         this.httpServer = new HttpServer(loggers.http, this.service);
         await this.httpServer.listen(

lib/Xud.ts

@@ -0,0 +1,29 @@
+import { Arguments, Argv } from 'yargs';
+import { LogLevel, SetLogLevelRequest } from '../../proto/xudrpc_pb';
+import { callback, loadXudClient } from '../command';
+import { LevelPriority } from '../../Logger';
+
+export const command = 'loglevel <level>';
+
+export const describe = 'set the logging level for xud';
+
+export const builder = (argv: Argv) => argv
+  .positional('level', {
+    description: 'the logging level',
+    type: 'string',
+    choices: ['alert', 'error', 'warn', 'verbose', 'info', 'debug', 'trace'],
+    coerce: (logLevelStr: string) => {
+      const logLevelLower = logLevelStr.toLowerCase();
+      return logLevelLower;
+    },
+  })
+  .example('$0 loglevel trace', 'set log level to trace')
+  .example('$0 loglevel info', 'set log level to info');
+
+export const handler = async (argv: Arguments<any>) => {
+  const request = new SetLogLevelRequest();
+  const levelPriority = LevelPriority[argv.level] as unknown as number;
+  const logLevel: LogLevel = levelPriority as LogLevel;
+  request.setLogLevel(logLevel);
+  (await loadXudClient(argv)).setLogLevel(request, callback(argv));
+};

lib/cli/commands/loglevel.ts

@@ -10,7 +10,7 @@ export const describe = 'unlock local xud node';
 export const builder = {};
 
 const formatOutput = (response: UnlockNodeResponse.AsObject) => {
-  console.log('xud was unlocked succesfully');
+  console.log('xud was unlocked successfully');
   if (response.unlockedLndsList.length) {
     console.log(`The following wallets were unlocked: ${response.unlockedLndsList.join(', ')}`);
   }

lib/cli/commands/unlock.ts

@@ -40,7 +40,6 @@ export const placeOrderBuilder = (argv: Argv, side: OrderSide) => {
   })
   .example(`$0 ${command} 5 LTC/BTC .01 1337`, `place a limit order to ${command} 5 LTC @ 0.01 BTC with local order id 1337`)
   .example(`$0 ${command} max LTC/BTC .01`, `place a limit order to ${command} max LTC @ 0.01 BTC`)
-  .example(`$0 ${command} max BTC/USDT mkt`, `place a market order to ${command} max BTC for USDT`)
   .example(`$0 ${command} 3 BTC/USDT mkt`, `place a market order to ${command} 3 BTC for USDT`)
   .example(`$0 ${command} 1 BTC/USDT market`, `place a market order to ${command} 1 BTC for USDT`);
 };

lib/cli/placeorder.ts

@@ -843,6 +843,20 @@ class GrpcService {
     }
   }
 
+  public setLogLevel: grpc.handleUnaryCall<xudrpc.SetLogLevelRequest, xudrpc.SetLogLevelResponse> = async (call, callback) => {
+    if (!this.isReady(this.service, callback)) {
+      return;
+    }
+    try {
+      await this.service.setLogLevel(call.request.toObject());
+
+      const response = new xudrpc.SetLogLevelResponse();
+      callback(null, response);
+    } catch (err) {
+      callback(getGrpcError(err), null);
+    }
+  }
+
   public shutdown: grpc.handleUnaryCall<xudrpc.ShutdownRequest, xudrpc.ShutdownResponse> = (_, callback) => {
     if (!this.isReady(this.service, callback)) {
       return;

lib/grpc/GrpcService.ts

@@ -22,6 +22,7 @@ const getGrpcError = (err: any) => {
     case orderErrorCodes.MIN_QUANTITY_VIOLATED:
     case orderErrorCodes.QUANTITY_DOES_NOT_MATCH:
     case swapErrorCodes.REMOTE_IDENTIFIER_MISSING:
+    case orderErrorCodes.DUPLICATE_PAIR_CURRENCIES:
       code = status.INVALID_ARGUMENT;
       break;
     case orderErrorCodes.PAIR_DOES_NOT_EXIST:

lib/grpc/getGrpcError.ts

@@ -290,6 +290,9 @@ class OrderBook extends EventEmitter {
 
   public addPair = async (pair: Pair) => {
     const pairId = derivePairId(pair);
+    if (pair.baseCurrency.toLowerCase() === pair.quoteCurrency.toLowerCase()) {
+      throw errors.DUPLICATE_PAIR_CURRENCIES(pair.baseCurrency, pair.quoteCurrency);
+    }
     if (this.pairInstances.has(pairId)) {
       throw errors.PAIR_ALREADY_EXISTS(pairId);
     }

lib/orderbook/OrderBook.ts

@@ -16,6 +16,7 @@ const errorCodes = {
   INSUFFICIENT_OUTBOUND_BALANCE: codesPrefix.concat('.12'),
   MIN_QUANTITY_VIOLATED: codesPrefix.concat('.13'),
   QUANTITY_ON_HOLD: codesPrefix.concat('.15'),
+  DUPLICATE_PAIR_CURRENCIES: codesPrefix.concat('.16'),
 };
 
 const errors = {
@@ -75,6 +76,10 @@ const errors = {
     message: `order with local id ${localId} has a quantity of ${holdQuantity} satoshis on hold, try again later`,
     code: errorCodes.QUANTITY_DOES_NOT_MATCH,
   }),
+  DUPLICATE_PAIR_CURRENCIES: (baseCurrency: string, quoteCurrency: string) => ({
+    message: `base asset (${baseCurrency}) and quote asset (${quoteCurrency}) have to be different`,
+    code: errorCodes.DUPLICATE_PAIR_CURRENCIES,
+  }),
 };
 
 export { errorCodes };