Merge pull request #1889 from ExchangeUnion/grpc-arg-check

fix: grpc throws error for addpair/withdraw for wrong argument (#1844)

lib/cli/commands/addpair.ts

@@ -27,6 +27,10 @@ export const handler = async (argv: Arguments<any>) => {
     quoteCurrency = argv.quote_currency;
   } else {
     [baseCurrency, quoteCurrency] = argv.pair_id.split('/');
+    if (!baseCurrency || !quoteCurrency) {
+      console.error(`${argv.pair_id} is not a valid pair`);
+      process.exit(1);
+    }
   }
   request.setBaseCurrency(baseCurrency.toUpperCase());
   request.setQuoteCurrency(quoteCurrency.toUpperCase());

lib/cli/commands/walletwithdraw.ts

@@ -3,42 +3,42 @@ import { WithdrawRequest } from '../../proto/xudrpc_pb';
 import { callback, loadXudClient } from '../command';
 import { coinsToSats } from '../utils';
 
-export const command = 'walletwithdraw [amount] [currency] [destination] [fee]';
+export const command = 'walletwithdraw <amount> <currency> <destination> [fee]';
 
 export const describe = 'withdraws on-chain funds from xud';
 
 export const builder = (argv: Argv) => argv
-  .option('amount', {
-    description: 'the amount to withdraw',
-    type: 'number',
+  .positional('amount', {
+    description: 'the amount to withdraw, `all` withdraws everything',
+    type: 'string',
   })
-  .option('currency', {
+  .positional('currency', {
     description: 'the ticker symbol of the currency to withdraw.',
     type: 'string',
   })
-  .option('destination', {
+  .positional('destination', {
     description: 'the address to send withdrawn funds to',
     type: 'string',
   })
   .option('fee', {
     description: 'the fee in satoshis (or equivalent) per byte',
     type: 'number',
   })
-  .option('all', {
-    description: 'whether to withdraw all available funds',
-    type: 'boolean',
-  })
   .example('$0 walletwithdraw 0.1 BTC 1BitcoinEaterAddressDontSendf59kuE', 'withdraws 0.1 BTC')
   .example('$0 walletwithdraw 0.1 BTC 1BitcoinEaterAddressDontSendf59kuE 20', 'withdraws 0.1 BTC using 20 sats/byte')
-  .example('$0 walletwithdraw --all --currency BTC --address 1BitcoinEaterAddressDontSendf59kuE', 'withdraws all BTC');
+  .example('$0 walletwithdraw all BTC 1BitcoinEaterAddressDontSendf59kuE', 'withdraws all BTC');
 
 export const handler = async (argv: Arguments<any>) => {
   const request = new WithdrawRequest();
   request.setCurrency(argv.currency.toUpperCase());
-  if (argv.all) {
-    request.setAll(argv.all);
+  if (argv.amount === 'all') {
+    request.setAll(true);
   } else {
-    request.setAmount(coinsToSats(argv.amount));
+    if (isNaN(argv.amount)) {
+      console.error('amount is not a valid number');
+      process.exit(1);
+    }
+    request.setAmount(coinsToSats(parseFloat(argv.amount)));
   }
   request.setDestination(argv.destination);
   request.setFee(argv.fee);