From 79a47cf56989b058b68c5663ce73ce107cfbd2e6 Mon Sep 17 00:00:00 2001
From: Ryan O'Hara-Reid <oharareid.ryan@gmail.com>
Date: Thu, 24 Jun 2021 15:02:21 +1000
Subject: [PATCH] gctcli: bump urfave cli depends version (#698)

* gctcli: bump version

* gctcli: flag alias done differenttttttttttttt

* gctcli: add autocomplete scripts to folder within gctcli cmd folder structure
---
 .../gctcli/autocomplete}/bash_autocomplete    |   4 +-
 cmd/gctcli/autocomplete/gctcli.ps1            |  13 +
 cmd/gctcli/autocomplete/zsh_autocomplete      |  27 +
 cmd/gctcli/commands.go                        | 478 +++++++++---------
 cmd/gctcli/main.go                            |  14 +-
 cmd/gctcli/pair_management.go                 |  50 +-
 cmd/gctcli/trades.go                          | 155 +++---
 cmd/gctcli/websocket_management.go            |  26 +-
 contrib/zsh_autocomplete                      |  14 -
 go.mod                                        |   1 -
 go.sum                                        |   2 -
 11 files changed, 422 insertions(+), 362 deletions(-)
 rename {contrib => cmd/gctcli/autocomplete}/bash_autocomplete (80%)
 create mode 100644 cmd/gctcli/autocomplete/gctcli.ps1
 create mode 100644 cmd/gctcli/autocomplete/zsh_autocomplete
 delete mode 100644 contrib/zsh_autocomplete

diff --git a/contrib/bash_autocomplete b/cmd/gctcli/autocomplete/bash_autocomplete
similarity index 80%
rename from contrib/bash_autocomplete
rename to cmd/gctcli/autocomplete/bash_autocomplete
index 6d6c7d9a..070d842e 100644
--- a/contrib/bash_autocomplete
+++ b/cmd/gctcli/autocomplete/bash_autocomplete
@@ -1,6 +1,8 @@
 #! /bin/bash
+
 # bash programmable completion for gctcli
-# copy to /etc/bash_completion.d/gctcli and source it or restart your shell
+# For info on implementation for current shell session or persistence:
+# https://github.com/urfave/cli/blob/master/docs/v2/manual.md#enabling
 
 : ${PROG:=$(basename ${BASH_SOURCE})}
 
diff --git a/cmd/gctcli/autocomplete/gctcli.ps1 b/cmd/gctcli/autocomplete/gctcli.ps1
new file mode 100644
index 00000000..6c969bc1
--- /dev/null
+++ b/cmd/gctcli/autocomplete/gctcli.ps1
@@ -0,0 +1,13 @@
+# PowerShell programmable completion for gctcli
+# For info on implementation for current shell session or persistence:
+# https://github.com/urfave/cli/blob/master/docs/v2/manual.md#powershell-support
+
+$fn = $($MyInvocation.MyCommand.Name)
+$name = $fn -replace "(.*)\.ps1$", '$1'
+Register-ArgumentCompleter -Native -CommandName $name -ScriptBlock {
+     param($commandName, $wordToComplete, $cursorPosition)
+     $other = "$wordToComplete --generate-bash-completion"
+         Invoke-Expression $other | ForEach-Object {
+            [System.Management.Automation.CompletionResult]::new($_, $_, 'ParameterValue', $_)
+         }
+ }
\ No newline at end of file
diff --git a/cmd/gctcli/autocomplete/zsh_autocomplete b/cmd/gctcli/autocomplete/zsh_autocomplete
new file mode 100644
index 00000000..9199c9fd
--- /dev/null
+++ b/cmd/gctcli/autocomplete/zsh_autocomplete
@@ -0,0 +1,27 @@
+#compdef $PROG
+
+# zsh programmable completion for gctcli
+# For info on implementation for current shell session or persistence:
+# https://github.com/urfave/cli/blob/master/docs/v2/manual.md#zsh-support
+
+_gctcli() {
+
+  local -a opts
+  local cur
+  cur=${words[-1]}
+  if [[ "$cur" == "-"* ]]; then
+    opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} ${cur} --generate-bash-completion)}")
+  else
+    opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} --generate-bash-completion)}")
+  fi
+
+  if [[ "${opts[1]}" != "" ]]; then
+    _describe 'values' opts
+  else
+    _files
+  fi
+
+  return
+}
+
+compdef _gctcli $PROG
\ No newline at end of file
diff --git a/cmd/gctcli/commands.go b/cmd/gctcli/commands.go
index c906e754..0391222a 100644
--- a/cmd/gctcli/commands.go
+++ b/cmd/gctcli/commands.go
@@ -15,14 +15,14 @@ import (
 	"github.com/thrasher-corp/gocryptotrader/common"
 	"github.com/thrasher-corp/gocryptotrader/currency"
 	"github.com/thrasher-corp/gocryptotrader/gctrpc"
-	"github.com/urfave/cli"
+	cli "github.com/urfave/cli/v2"
 	"google.golang.org/grpc"
 )
 
 var startTime, endTime, order string
 var limit int
 
-var getInfoCommand = cli.Command{
+var getInfoCommand = &cli.Command{
 	Name:   "getinfo",
 	Usage:  "gets GoCryptoTrader info",
 	Action: getInfo,
@@ -48,7 +48,7 @@ func getInfo(_ *cli.Context) error {
 	return nil
 }
 
-var getSubsystemsCommand = cli.Command{
+var getSubsystemsCommand = &cli.Command{
 	Name:   "getsubsystems",
 	Usage:  "gets GoCryptoTrader subsystems and their status",
 	Action: getSubsystems,
@@ -74,13 +74,13 @@ func getSubsystems(_ *cli.Context) error {
 	return nil
 }
 
-var enableSubsystemCommand = cli.Command{
+var enableSubsystemCommand = &cli.Command{
 	Name:      "enablesubsystem",
 	Usage:     "enables an engine subsystem",
 	ArgsUsage: "<subsystem>",
 	Action:    enableSubsystem,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "subsystem",
 			Usage: "the subsystem to enable",
 		},
@@ -124,13 +124,13 @@ func enableSubsystem(c *cli.Context) error {
 	return nil
 }
 
-var disableSubsystemCommand = cli.Command{
+var disableSubsystemCommand = &cli.Command{
 	Name:      "disablesubsystem",
 	Usage:     "disables an engine subsystem",
 	ArgsUsage: "<subsystem>",
 	Action:    disableSubsystem,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "subsystem",
 			Usage: "the subsystem to disable",
 		},
@@ -174,7 +174,7 @@ func disableSubsystem(c *cli.Context) error {
 	return nil
 }
 
-var getRPCEndpointsCommand = cli.Command{
+var getRPCEndpointsCommand = &cli.Command{
 	Name:   "getrpcendpoints",
 	Usage:  "gets GoCryptoTrader endpoints info",
 	Action: getRPCEndpoints,
@@ -200,7 +200,7 @@ func getRPCEndpoints(_ *cli.Context) error {
 	return nil
 }
 
-var getCommunicationRelayersCommand = cli.Command{
+var getCommunicationRelayersCommand = &cli.Command{
 	Name:   "getcommsrelayers",
 	Usage:  "gets GoCryptoTrader communication relayers",
 	Action: getCommunicationRelayers,
@@ -226,13 +226,13 @@ func getCommunicationRelayers(_ *cli.Context) error {
 	return nil
 }
 
-var getExchangesCommand = cli.Command{
+var getExchangesCommand = &cli.Command{
 	Name:      "getexchanges",
 	Usage:     "gets a list of enabled or available exchanges",
 	ArgsUsage: "<enabled>",
 	Action:    getExchanges,
 	Flags: []cli.Flag{
-		cli.BoolFlag{
+		&cli.BoolFlag{
 			Name:  "enabled",
 			Usage: "whether to list enabled exchanges or not",
 		},
@@ -266,13 +266,13 @@ func getExchanges(c *cli.Context) error {
 	return nil
 }
 
-var enableExchangeCommand = cli.Command{
+var enableExchangeCommand = &cli.Command{
 	Name:      "enableexchange",
 	Usage:     "enables an exchange",
 	ArgsUsage: "<exchange>",
 	Action:    enableExchange,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to enable",
 		},
@@ -316,13 +316,13 @@ func enableExchange(c *cli.Context) error {
 	return nil
 }
 
-var disableExchangeCommand = cli.Command{
+var disableExchangeCommand = &cli.Command{
 	Name:      "disableexchange",
 	Usage:     "disables an exchange",
 	ArgsUsage: "<exchange>",
 	Action:    disableExchange,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to disable",
 		},
@@ -366,13 +366,13 @@ func disableExchange(c *cli.Context) error {
 	return nil
 }
 
-var getExchangeOTPCommand = cli.Command{
+var getExchangeOTPCommand = &cli.Command{
 	Name:      "getexchangeotp",
 	Usage:     "gets a specific exchange OTP code",
 	ArgsUsage: "<exchange>",
 	Action:    getExchangeOTPCode,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to get the OTP code for",
 		},
@@ -416,7 +416,7 @@ func getExchangeOTPCode(c *cli.Context) error {
 	return nil
 }
 
-var getExchangeOTPsCommand = cli.Command{
+var getExchangeOTPsCommand = &cli.Command{
 	Name:   "getexchangeotps",
 	Usage:  "gets all exchange OTP codes",
 	Action: getExchangeOTPCodes,
@@ -441,13 +441,13 @@ func getExchangeOTPCodes(c *cli.Context) error {
 	return nil
 }
 
-var getExchangeInfoCommand = cli.Command{
+var getExchangeInfoCommand = &cli.Command{
 	Name:      "getexchangeinfo",
 	Usage:     "gets a specific exchanges info",
 	ArgsUsage: "<exchange>",
 	Action:    getExchangeInfo,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to get the info for",
 		},
@@ -491,21 +491,21 @@ func getExchangeInfo(c *cli.Context) error {
 	return nil
 }
 
-var getTickerCommand = cli.Command{
+var getTickerCommand = &cli.Command{
 	Name:      "getticker",
 	Usage:     "gets the ticker for a specific currency pair and exchange",
 	ArgsUsage: "<exchange> <pair> <asset>",
 	Action:    getTicker,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to get the ticker for",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "pair",
 			Usage: "the currency pair to get the ticker for",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "asset",
 			Usage: "the asset type of the currency pair to get the ticker for",
 		},
@@ -584,7 +584,7 @@ func getTicker(c *cli.Context) error {
 	return nil
 }
 
-var getTickersCommand = cli.Command{
+var getTickersCommand = &cli.Command{
 	Name:   "gettickers",
 	Usage:  "gets all tickers for all enabled exchanges and currency pairs",
 	Action: getTickers,
@@ -607,21 +607,21 @@ func getTickers(_ *cli.Context) error {
 	return nil
 }
 
-var getOrderbookCommand = cli.Command{
+var getOrderbookCommand = &cli.Command{
 	Name:      "getorderbook",
 	Usage:     "gets the orderbook for a specific currency pair and exchange",
 	ArgsUsage: "<exchange> <pair> <asset>",
 	Action:    getOrderbook,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to get the orderbook for",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "pair",
 			Usage: "the currency pair to get the orderbook for",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "asset",
 			Usage: "the asset type of the currency pair to get the orderbook for",
 		},
@@ -700,7 +700,7 @@ func getOrderbook(c *cli.Context) error {
 	return nil
 }
 
-var getOrderbooksCommand = cli.Command{
+var getOrderbooksCommand = &cli.Command{
 	Name:   "getorderbooks",
 	Usage:  "gets all orderbooks for all enabled exchanges and currency pairs",
 	Action: getOrderbooks,
@@ -723,17 +723,17 @@ func getOrderbooks(_ *cli.Context) error {
 	return nil
 }
 
-var getAccountInfoCommand = cli.Command{
+var getAccountInfoCommand = &cli.Command{
 	Name:      "getaccountinfo",
 	Usage:     "gets the exchange account balance info",
 	ArgsUsage: "<exchange> <asset>",
 	Action:    getAccountInfo,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to get the account info for",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "asset",
 			Usage: "the asset type to get the account info for",
 		},
@@ -787,17 +787,17 @@ func getAccountInfo(c *cli.Context) error {
 	return nil
 }
 
-var getAccountInfoStreamCommand = cli.Command{
+var getAccountInfoStreamCommand = &cli.Command{
 	Name:      "getaccountinfostream",
 	Usage:     "gets the account info stream for a specific exchange",
 	ArgsUsage: "<exchange> <asset>",
 	Action:    getAccountInfoStream,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to get the account info stream from",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "asset",
 			Usage: "the asset type to get the account info stream for",
 		},
@@ -862,17 +862,17 @@ func getAccountInfoStream(c *cli.Context) error {
 	}
 }
 
-var updateAccountInfoCommand = cli.Command{
+var updateAccountInfoCommand = &cli.Command{
 	Name:      "updateaccountinfo",
 	Usage:     "updates the exchange account balance info",
 	ArgsUsage: "<exchange> <asset>",
 	Action:    updateAccountInfo,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to get the account info for",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "asset",
 			Usage: "the asset type to get the account info for",
 		},
@@ -927,7 +927,7 @@ func updateAccountInfo(c *cli.Context) error {
 	return nil
 }
 
-var getConfigCommand = cli.Command{
+var getConfigCommand = &cli.Command{
 	Name:   "getconfig",
 	Usage:  "gets the config",
 	Action: getConfig,
@@ -950,7 +950,7 @@ func getConfig(_ *cli.Context) error {
 	return nil
 }
 
-var getPortfolioCommand = cli.Command{
+var getPortfolioCommand = &cli.Command{
 	Name:   "getportfolio",
 	Usage:  "gets the portfolio",
 	Action: getPortfolio,
@@ -973,7 +973,7 @@ func getPortfolio(_ *cli.Context) error {
 	return nil
 }
 
-var getPortfolioSummaryCommand = cli.Command{
+var getPortfolioSummaryCommand = &cli.Command{
 	Name:   "getportfoliosummary",
 	Usage:  "gets the portfolio summary",
 	Action: getPortfolioSummary,
@@ -996,33 +996,33 @@ func getPortfolioSummary(_ *cli.Context) error {
 	return nil
 }
 
-var addPortfolioAddressCommand = cli.Command{
+var addPortfolioAddressCommand = &cli.Command{
 	Name:      "addportfolioaddress",
 	Usage:     "adds an address to the portfolio",
 	ArgsUsage: "<address> <coin_type> <description> <balance> <cold_storage> <supported_exchanges> ",
 	Action:    addPortfolioAddress,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "address",
 			Usage: "the address to add to the portfolio",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "coin_type",
 			Usage: "the coin type e.g ('BTC')",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "description",
 			Usage: "description of the address",
 		},
-		cli.Float64Flag{
+		&cli.Float64Flag{
 			Name:  "balance",
 			Usage: "balance of the address",
 		},
-		cli.BoolFlag{
+		&cli.BoolFlag{
 			Name:  "cold_storage",
 			Usage: "true/false if address is cold storage",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "supported_exchanges",
 			Usage: "common separated list of exchanges supported by this address for withdrawals",
 		},
@@ -1109,21 +1109,21 @@ func addPortfolioAddress(c *cli.Context) error {
 	return nil
 }
 
-var removePortfolioAddressCommand = cli.Command{
+var removePortfolioAddressCommand = &cli.Command{
 	Name:      "removeportfolioaddress",
 	Usage:     "removes an address from the portfolio",
 	ArgsUsage: "<address> <coin_type> <description>",
 	Action:    removePortfolioAddress,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "address",
 			Usage: "the address to add to the portfolio",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "coin_type",
 			Usage: "the coin type e.g ('BTC')",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "description",
 			Usage: "description of the address",
 		},
@@ -1180,7 +1180,7 @@ func removePortfolioAddress(c *cli.Context) error {
 	return nil
 }
 
-var getForexProvidersCommand = cli.Command{
+var getForexProvidersCommand = &cli.Command{
 	Name:   "getforexproviders",
 	Usage:  "gets the available forex providers",
 	Action: getForexProviders,
@@ -1203,7 +1203,7 @@ func getForexProviders(_ *cli.Context) error {
 	return nil
 }
 
-var getForexRatesCommand = cli.Command{
+var getForexRatesCommand = &cli.Command{
 	Name:   "getforexrates",
 	Usage:  "gets forex rates",
 	Action: getForexRates,
@@ -1226,31 +1226,31 @@ func getForexRates(_ *cli.Context) error {
 	return nil
 }
 
-var getOrdersCommand = cli.Command{
+var getOrdersCommand = &cli.Command{
 	Name:      "getorders",
 	Usage:     "gets the open orders",
 	ArgsUsage: "<exchange> <asset> <pair> <start> <end>",
 	Action:    getOrders,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to get orders for",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "asset",
 			Usage: "the asset type to get orders for",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "pair",
 			Usage: "the currency pair to get orders for",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:        "start",
 			Usage:       "start date, optional. Will filter any results before this date",
 			Value:       time.Now().AddDate(0, -1, 0).Format(common.SimpleTimeFormat),
 			Destination: &startTime,
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:        "end",
 			Usage:       "end date, optional. Will filter any results after this date",
 			Value:       time.Now().Format(common.SimpleTimeFormat),
@@ -1356,25 +1356,25 @@ func getOrders(c *cli.Context) error {
 	return nil
 }
 
-var getOrderCommand = cli.Command{
+var getOrderCommand = &cli.Command{
 	Name:      "getorder",
 	Usage:     "gets the specified order info",
 	ArgsUsage: "<exchange> <order_id> <pair>",
 	Action:    getOrder,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to get the order for",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "asset",
 			Usage: "required asset type",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "pair",
 			Usage: "the pair to retrieve",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "order_id",
 			Usage: "the order id to retrieve",
 		},
@@ -1455,41 +1455,41 @@ func getOrder(c *cli.Context) error {
 	return nil
 }
 
-var submitOrderCommand = cli.Command{
+var submitOrderCommand = &cli.Command{
 	Name:      "submitorder",
 	Usage:     "submit order submits an exchange order",
 	ArgsUsage: "<exchange> <pair> <side> <type> <amount> <price> <client_id>",
 	Action:    submitOrder,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to submit the order for",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "pair",
 			Usage: "the currency pair",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "side",
 			Usage: "the order side to use (BUY OR SELL)",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "type",
 			Usage: "the order type (MARKET OR LIMIT)",
 		},
-		cli.Float64Flag{
+		&cli.Float64Flag{
 			Name:  "amount",
 			Usage: "the amount for the order",
 		},
-		cli.Float64Flag{
+		&cli.Float64Flag{
 			Name:  "price",
 			Usage: "the price for the order",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "client_id",
 			Usage: "the optional client order ID",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "asset",
 			Usage: "required asset type",
 		},
@@ -1626,25 +1626,25 @@ func submitOrder(c *cli.Context) error {
 	return nil
 }
 
-var simulateOrderCommand = cli.Command{
+var simulateOrderCommand = &cli.Command{
 	Name:      "simulateorder",
 	Usage:     "simulate order simulates an exchange order",
 	ArgsUsage: "<exchange> <pair> <side> <amount>",
 	Action:    simulateOrder,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to simulate the order for",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "pair",
 			Usage: "the currency pair",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "side",
 			Usage: "the order side to use (BUY OR SELL)",
 		},
-		cli.Float64Flag{
+		&cli.Float64Flag{
 			Name:  "amount",
 			Usage: "the amount for the order",
 		},
@@ -1735,25 +1735,25 @@ func simulateOrder(c *cli.Context) error {
 	return nil
 }
 
-var whaleBombCommand = cli.Command{
+var whaleBombCommand = &cli.Command{
 	Name:      "whalebomb",
 	Usage:     "whale bomb finds the amount required to reach a price target",
 	ArgsUsage: "<exchange> <pair> <side> <price>",
 	Action:    whaleBomb,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to whale bomb",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "pair",
 			Usage: "the currency pair",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "side",
 			Usage: "the order side to use (BUY OR SELL)",
 		},
-		cli.Float64Flag{
+		&cli.Float64Flag{
 			Name:  "price",
 			Usage: "the price target",
 		},
@@ -1840,37 +1840,37 @@ func whaleBomb(c *cli.Context) error {
 	return nil
 }
 
-var cancelOrderCommand = cli.Command{
+var cancelOrderCommand = &cli.Command{
 	Name:      "cancelorder",
 	Usage:     "cancel order cancels an exchange order",
 	ArgsUsage: "<exchange> <account_id> <order_id> <pair> <asset> <wallet_address> <side>",
 	Action:    cancelOrder,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to cancel the order for",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "account_id",
 			Usage: "the account id",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "order_id",
 			Usage: "the order id",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "pair",
 			Usage: "the currency pair to cancel the order for",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "asset",
 			Usage: "the asset type",
 		},
-		cli.Float64Flag{
+		&cli.Float64Flag{
 			Name:  "wallet_address",
 			Usage: "the wallet address",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "side",
 			Usage: "the order side",
 		},
@@ -1986,37 +1986,37 @@ func cancelOrder(c *cli.Context) error {
 	return nil
 }
 
-var cancelBatchOrdersCommand = cli.Command{
+var cancelBatchOrdersCommand = &cli.Command{
 	Name:      "cancelbatchorders",
 	Usage:     "cancel batch orders cancels a list of exchange orders (comma separated)",
 	ArgsUsage: "<exchange> <account_id> <order_ids> <pair> <asset> <wallet_address> <side>",
 	Action:    cancelBatchOrders,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to cancel the order for",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "account_id",
 			Usage: "the account id",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "order_ids",
 			Usage: "the comma separated orders id-s",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "pair",
 			Usage: "the currency pair to cancel the order for",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "asset",
 			Usage: "the asset type",
 		},
-		cli.Float64Flag{
+		&cli.Float64Flag{
 			Name:  "wallet_address",
 			Usage: "the wallet address",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "side",
 			Usage: "the order side",
 		},
@@ -2132,13 +2132,13 @@ func cancelBatchOrders(c *cli.Context) error {
 	return nil
 }
 
-var cancelAllOrdersCommand = cli.Command{
+var cancelAllOrdersCommand = &cli.Command{
 	Name:      "cancelallorders",
 	Usage:     "cancels all orders (all or by exchange name)",
 	ArgsUsage: "<exchange>",
 	Action:    cancelAllOrders,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to cancel all orders on",
 		},
@@ -2178,7 +2178,7 @@ func cancelAllOrders(c *cli.Context) error {
 	return nil
 }
 
-var getEventsCommand = cli.Command{
+var getEventsCommand = &cli.Command{
 	Name:   "getevents",
 	Usage:  "gets all events",
 	Action: getEvents,
@@ -2201,49 +2201,49 @@ func getEvents(_ *cli.Context) error {
 	return nil
 }
 
-var addEventCommand = cli.Command{
+var addEventCommand = &cli.Command{
 	Name:      "addevent",
 	Usage:     "adds an event",
 	ArgsUsage: "<exchange> <item> <condition> <price> <check_bids> <check_bids_and_asks> <orderbook_amount> <pair> <asset> <action>",
 	Action:    addEvent,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to add an event for",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "item",
 			Usage: "the item to trigger the event",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "condition",
 			Usage: "the condition for the event",
 		},
-		cli.Float64Flag{
+		&cli.Float64Flag{
 			Name:  "price",
 			Usage: "the price to trigger the event",
 		},
-		cli.BoolFlag{
+		&cli.BoolFlag{
 			Name:  "check_bids",
 			Usage: "whether to check the bids",
 		},
-		cli.BoolFlag{
+		&cli.BoolFlag{
 			Name:  "check_asks",
 			Usage: "whether to check the asks",
 		},
-		cli.Float64Flag{
+		&cli.Float64Flag{
 			Name:  "orderbook_amount",
 			Usage: "the orderbook amount to trigger the event",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "pair",
 			Usage: "the currency pair",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "asset",
 			Usage: "the asset type",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "action",
 			Usage: "the action for the event to perform upon trigger",
 		},
@@ -2367,13 +2367,13 @@ func addEvent(c *cli.Context) error {
 	return nil
 }
 
-var removeEventCommand = cli.Command{
+var removeEventCommand = &cli.Command{
 	Name:      "removeevent",
 	Usage:     "removes an event",
 	ArgsUsage: "<event_id>",
 	Action:    removeEvent,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "event_id",
 			Usage: "the event id to remove",
 		},
@@ -2417,13 +2417,13 @@ func removeEvent(c *cli.Context) error {
 	return nil
 }
 
-var getCryptocurrencyDepositAddressesCommand = cli.Command{
+var getCryptocurrencyDepositAddressesCommand = &cli.Command{
 	Name:      "getcryptocurrencydepositaddresses",
 	Usage:     "gets the cryptocurrency deposit addresses for an exchange",
 	ArgsUsage: "<exchange>",
 	Action:    getCryptocurrencyDepositAddresses,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to get the cryptocurrency deposit addresses for",
 		},
@@ -2463,17 +2463,17 @@ func getCryptocurrencyDepositAddresses(c *cli.Context) error {
 	return nil
 }
 
-var getCryptocurrencyDepositAddressCommand = cli.Command{
+var getCryptocurrencyDepositAddressCommand = &cli.Command{
 	Name:      "getcryptocurrencydepositaddress",
 	Usage:     "gets the cryptocurrency deposit address for an exchange and cryptocurrency",
 	ArgsUsage: "<exchange> <cryptocurrency>",
 	Action:    getCryptocurrencyDepositAddress,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to get the cryptocurrency deposit address for",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "cryptocurrency",
 			Usage: "the cryptocurrency to get the deposit address for",
 		},
@@ -2529,37 +2529,37 @@ func getCryptocurrencyDepositAddress(c *cli.Context) error {
 	return nil
 }
 
-var withdrawCryptocurrencyFundsCommand = cli.Command{
+var withdrawCryptocurrencyFundsCommand = &cli.Command{
 	Name:      "withdrawcryptofunds",
 	Usage:     "withdraws cryptocurrency funds from the desired exchange",
 	ArgsUsage: "<exchange> <currency>  <amount> <address> <addresstag> <fee> <description>",
 	Action:    withdrawCryptocurrencyFunds,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to withdraw from",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "currency",
 			Usage: "the cryptocurrency to withdraw funds from",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "address",
 			Usage: "address to withdraw to",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "addresstag",
 			Usage: "address tag/memo",
 		},
-		cli.Float64Flag{
+		&cli.Float64Flag{
 			Name:  "amount",
 			Usage: "amount of funds to withdraw",
 		},
-		cli.Float64Flag{
+		&cli.Float64Flag{
 			Name:  "fee",
 			Usage: "fee to submit with request",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "description",
 			Usage: "description to submit with request",
 		},
@@ -2652,29 +2652,29 @@ func withdrawCryptocurrencyFunds(c *cli.Context) error {
 	return nil
 }
 
-var withdrawFiatFundsCommand = cli.Command{
+var withdrawFiatFundsCommand = &cli.Command{
 	Name:      "withdrawfiatfunds",
 	Usage:     "withdraws fiat funds from the desired exchange",
 	ArgsUsage: "<exchange> <currency> <amount> <bankaccount id> <description>",
 	Action:    withdrawFiatFunds,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to withdraw from",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "currency",
 			Usage: "the fiat currency to withdraw funds from",
 		},
-		cli.Float64Flag{
+		&cli.Float64Flag{
 			Name:  "amount",
 			Usage: "amount of funds to withdraw",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "bankaccountid",
 			Usage: "ID of bank account to use",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "description",
 			Usage: "description to submit with request",
 		},
@@ -2749,17 +2749,17 @@ func withdrawFiatFunds(c *cli.Context) error {
 	return nil
 }
 
-var withdrawalRequestCommand = cli.Command{
+var withdrawalRequestCommand = &cli.Command{
 	Name:      "withdrawalrequesthistory",
 	Usage:     "retrieve previous withdrawal request details",
 	ArgsUsage: "<type> <args>",
-	Subcommands: []cli.Command{
+	Subcommands: []*cli.Command{
 		{
 			Name:      "byid",
 			Usage:     "id",
 			ArgsUsage: "<id>",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "id",
 					Usage: "withdrawal id",
 				},
@@ -2771,11 +2771,11 @@ var withdrawalRequestCommand = cli.Command{
 			Usage:     "exchange id",
 			ArgsUsage: "<id>",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "exchange",
 					Usage: "exchange name",
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "id",
 					Usage: "withdrawal id",
 				},
@@ -2787,15 +2787,15 @@ var withdrawalRequestCommand = cli.Command{
 			Usage:     "exchange limit",
 			ArgsUsage: "<id>",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "exchange",
 					Usage: "exchange name",
 				},
-				cli.Int64Flag{
+				&cli.Int64Flag{
 					Name:  "limit",
 					Usage: "max number of withdrawals to return",
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "currency",
 					Usage: "<currency>",
 				},
@@ -2807,23 +2807,23 @@ var withdrawalRequestCommand = cli.Command{
 			Usage:     "exchange start end limit",
 			ArgsUsage: "<exchange> <start> <end> <limit>",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "exchange",
 					Usage: "the currency used in to withdraw",
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:        "start",
 					Usage:       "the start date to get withdrawals from. Any withdrawal before this date will be filtered",
 					Value:       time.Now().AddDate(0, -1, 0).Format(common.SimpleTimeFormat),
 					Destination: &startTime,
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:        "end",
 					Usage:       "the end date to get withdrawals from. Any withdrawal after this date will be filtered",
 					Value:       time.Now().Format(common.SimpleTimeFormat),
 					Destination: &endTime,
 				},
-				cli.Int64Flag{
+				&cli.Int64Flag{
 					Name:  "limit",
 					Usage: "max number of withdrawals to return",
 				},
@@ -3013,13 +3013,13 @@ func withdrawlRequestByDate(c *cli.Context) error {
 	return nil
 }
 
-var getLoggerDetailsCommand = cli.Command{
+var getLoggerDetailsCommand = &cli.Command{
 	Name:      "getloggerdetails",
 	Usage:     "gets an individual loggers details",
 	ArgsUsage: "<logger>",
 	Action:    getLoggerDetails,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "logger",
 			Usage: "logger to get level details of",
 		},
@@ -3062,17 +3062,17 @@ func getLoggerDetails(c *cli.Context) error {
 	return nil
 }
 
-var setLoggerDetailsCommand = cli.Command{
+var setLoggerDetailsCommand = &cli.Command{
 	Name:      "setloggerdetails",
 	Usage:     "sets an individual loggers details",
 	ArgsUsage: "<logger> <flags>",
 	Action:    setLoggerDetails,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "logger",
 			Usage: "logger to get level details of",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "flags",
 			Usage: "pipe separated value of loggers e.g INFO|WARN",
 		},
@@ -3128,21 +3128,21 @@ func setLoggerDetails(c *cli.Context) error {
 	return nil
 }
 
-var getOrderbookStreamCommand = cli.Command{
+var getOrderbookStreamCommand = &cli.Command{
 	Name:      "getorderbookstream",
 	Usage:     "gets the orderbook stream for a specific currency pair and exchange",
 	ArgsUsage: "<exchange> <pair> <asset>",
 	Action:    getOrderbookStream,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to get the orderbook from",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "pair",
 			Usage: "currency pair",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "asset",
 			Usage: "the asset type of the currency pair",
 		},
@@ -3275,13 +3275,13 @@ func getOrderbookStream(c *cli.Context) error {
 	}
 }
 
-var getExchangeOrderbookStreamCommand = cli.Command{
+var getExchangeOrderbookStreamCommand = &cli.Command{
 	Name:      "getexchangeorderbookstream",
 	Usage:     "gets a stream for all orderbooks associated with an exchange",
 	ArgsUsage: "<exchange>",
 	Action:    getExchangeOrderbookStream,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to get the orderbook from",
 		},
@@ -3337,21 +3337,21 @@ func getExchangeOrderbookStream(c *cli.Context) error {
 	}
 }
 
-var getTickerStreamCommand = cli.Command{
+var getTickerStreamCommand = &cli.Command{
 	Name:      "gettickerstream",
 	Usage:     "gets the ticker stream for a specific currency pair and exchange",
 	ArgsUsage: "<exchange> <pair> <asset>",
 	Action:    getTickerStream,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to get the ticker from",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "pair",
 			Usage: "currency pair",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "asset",
 			Usage: "the asset type of the currency pair",
 		},
@@ -3454,13 +3454,13 @@ func getTickerStream(c *cli.Context) error {
 	}
 }
 
-var getExchangeTickerStreamCommand = cli.Command{
+var getExchangeTickerStreamCommand = &cli.Command{
 	Name:      "getexchangetickerstream",
 	Usage:     "gets a stream for all tickers associated with an exchange",
 	ArgsUsage: "<exchange>",
 	Action:    getExchangeTickerStream,
 	Flags: []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "exchange",
 			Usage: "the exchange to get the ticker from",
 		},
@@ -3521,32 +3521,36 @@ func getExchangeTickerStream(c *cli.Context) error {
 	}
 }
 
-var getAuditEventCommand = cli.Command{
+var getAuditEventCommand = &cli.Command{
 	Name:      "getauditevent",
 	Usage:     "gets audit events matching query parameters",
 	ArgsUsage: "<starttime> <endtime> <orderby> <limit>",
 	Action:    getAuditEvent,
 	Flags: []cli.Flag{
-		cli.StringFlag{
-			Name:        "start, s",
+		&cli.StringFlag{
+			Name:        "start",
+			Aliases:     []string{"s"},
 			Usage:       "start date to search",
 			Value:       time.Now().Add(-time.Hour).Format(common.SimpleTimeFormat),
 			Destination: &startTime,
 		},
-		cli.StringFlag{
-			Name:        "end, e",
+		&cli.StringFlag{
+			Name:        "end",
+			Aliases:     []string{"e"},
 			Usage:       "end time to search",
 			Value:       time.Now().Format(common.SimpleTimeFormat),
 			Destination: &endTime,
 		},
-		cli.StringFlag{
-			Name:        "order, o",
+		&cli.StringFlag{
+			Name:        "order",
+			Aliases:     []string{"o"},
 			Usage:       "order results by ascending/descending",
 			Value:       "asc",
 			Destination: &order,
 		},
-		cli.IntFlag{
-			Name:        "limit, l",
+		&cli.IntFlag{
+			Name:        "limit",
+			Aliases:     []string{"l"},
 			Usage:       "how many results to retrieve",
 			Value:       100,
 			Destination: &limit,
@@ -3622,22 +3626,22 @@ func getAuditEvent(c *cli.Context) error {
 }
 
 var uuid, filename, path string
-var gctScriptCommand = cli.Command{
+var gctScriptCommand = &cli.Command{
 	Name:      "script",
 	Usage:     "execute scripting management command",
 	ArgsUsage: "<command> <args>",
-	Subcommands: []cli.Command{
+	Subcommands: []*cli.Command{
 		{
 			Name:      "execute",
 			Usage:     "execute script filename",
 			ArgsUsage: "<filename> <path>",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:        "filename",
 					Usage:       "the script filename",
 					Destination: &filename,
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:        "path",
 					Usage:       "the directory of the script file",
 					Destination: &path,
@@ -3649,7 +3653,7 @@ var gctScriptCommand = cli.Command{
 			Name:  "query",
 			Usage: "query running virtual machine",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:        "uuid",
 					Usage:       "the unique id of the script in memory",
 					Destination: &uuid,
@@ -3661,7 +3665,7 @@ var gctScriptCommand = cli.Command{
 			Name:  "read",
 			Usage: "read script",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:        "name",
 					Usage:       "the script name",
 					Destination: &uuid,
@@ -3683,7 +3687,7 @@ var gctScriptCommand = cli.Command{
 			Name:  "stop",
 			Usage: "terminate running script",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:        "uuid",
 					Usage:       "the unique id of the script in memory",
 					Destination: &uuid,
@@ -3700,16 +3704,16 @@ var gctScriptCommand = cli.Command{
 			Name:  "upload",
 			Usage: "upload a new script/archive",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:        "path",
 					Usage:       "<path> to single script or zip collection",
 					Destination: &filename,
 				},
-				cli.BoolFlag{
+				&cli.BoolFlag{
 					Name:  "overwrite",
 					Usage: "<true/false>",
 				},
-				cli.BoolFlag{
+				&cli.BoolFlag{
 					Name:  "archived",
 					Usage: "<true/false>",
 				},
@@ -3720,11 +3724,11 @@ var gctScriptCommand = cli.Command{
 			Name:  "autoload",
 			Usage: "add or remove script from autoload list",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "command",
 					Usage: "<add/remove>",
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "script",
 					Usage: "<script name>",
 				},
@@ -4059,37 +4063,40 @@ const klineMessage = "%v in seconds supported values are: 15, 60(1min), 180(3min
 	"60480(1w), 1209600(2w), 1296000(15d), 2592000(1M), 31536000(1Y)"
 
 var candleRangeSize, candleGranularity int64
-var getHistoricCandlesCommand = cli.Command{
+var getHistoricCandlesCommand = &cli.Command{
 	Name:      "gethistoriccandles",
 	Usage:     "gets historical candles for the specified granularity up to range size time from now.",
 	ArgsUsage: "<exchange> <pair> <asset> <rangesize> <granularity>",
 	Action:    getHistoricCandles,
 	Flags: []cli.Flag{
-		cli.StringFlag{
-			Name:  "exchange, e",
-			Usage: "the exchange to get the candles from",
+		&cli.StringFlag{
+			Name:    "exchange",
+			Aliases: []string{"e"},
+			Usage:   "the exchange to get the candles from",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "pair",
 			Usage: "the currency pair to get the candles for",
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "asset",
 			Usage: "the asset type of the currency pair",
 		},
-		cli.Int64Flag{
-			Name:        "rangesize, r",
+		&cli.Int64Flag{
+			Name:        "rangesize",
+			Aliases:     []string{"r"},
 			Usage:       "the amount of time to go back from now to fetch candles in the given granularity",
 			Value:       10,
 			Destination: &candleRangeSize,
 		},
-		cli.Int64Flag{
-			Name:        "granularity, g",
+		&cli.Int64Flag{
+			Name:        "granularity",
+			Aliases:     []string{"g"},
 			Usage:       fmt.Sprintf(klineMessage, "granularity"),
 			Value:       86400,
 			Destination: &candleGranularity,
 		},
-		cli.BoolFlag{
+		&cli.BoolFlag{
 			Name:  "fillmissingdatawithtrades, fill",
 			Usage: "will create candles for missing intervals using stored trade data <true/false>",
 		},
@@ -4195,57 +4202,62 @@ func getHistoricCandles(c *cli.Context) error {
 	return nil
 }
 
-var getHistoricCandlesExtendedCommand = cli.Command{
+var getHistoricCandlesExtendedCommand = &cli.Command{
 	Name:      "gethistoriccandlesextended",
 	Usage:     "gets historical candles for the specified pair, asset, interval & date range",
 	ArgsUsage: "<exchange> <pair> <asset> <interval> <start> <end>",
 	Action:    getHistoricCandlesExtended,
 	Flags: []cli.Flag{
-		cli.StringFlag{
-			Name:  "exchange, e",
-			Usage: "the exchange to get the candles from",
+		&cli.StringFlag{
+			Name:    "exchange",
+			Aliases: []string{"e"},
+			Usage:   "the exchange to get the candles from",
 		},
-		cli.StringFlag{
-			Name:  "pair, p",
-			Usage: "the currency pair to get the candles for",
+		&cli.StringFlag{
+			Name:    "pair",
+			Aliases: []string{"p"},
+			Usage:   "the currency pair to get the candles for",
 		},
-		cli.StringFlag{
-			Name:  "asset, a",
-			Usage: "the asset type of the currency pair",
+		&cli.StringFlag{
+			Name:    "asset",
+			Aliases: []string{"a"},
+			Usage:   "the asset type of the currency pair",
 		},
-		cli.Int64Flag{
-			Name:        "interval, i",
+		&cli.Int64Flag{
+			Name:        "interval",
+			Aliases:     []string{"i"},
 			Usage:       fmt.Sprintf(klineMessage, "interval"),
 			Value:       86400,
 			Destination: &candleGranularity,
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:        "start",
 			Usage:       "the date to begin retrieveing candles. Any candles before this date will be filtered",
 			Value:       time.Now().AddDate(0, -1, 0).Format(common.SimpleTimeFormat),
 			Destination: &startTime,
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:        "end",
 			Usage:       "the date to end retrieveing candles. Any candles after this date will be filtered",
 			Value:       time.Now().Format(common.SimpleTimeFormat),
 			Destination: &endTime,
 		},
-		cli.BoolFlag{
+		&cli.BoolFlag{
 			Name:  "sync",
 			Usage: "<true/false>",
 		},
-		cli.BoolFlag{
+		&cli.BoolFlag{
 			Name:  "force",
 			Usage: "will overwrite any conflicting candle data on save <true/false>",
 		},
-		cli.BoolFlag{
+		&cli.BoolFlag{
 			Name:  "db",
 			Usage: "source data from database <true/false>",
 		},
-		cli.BoolFlag{
-			Name:  "fillmissingdatawithtrades, fill",
-			Usage: "will create candles for missing intervals using stored trade data <true/false>",
+		&cli.BoolFlag{
+			Name:    "fillmissingdatawithtrades",
+			Aliases: []string{"fill"},
+			Usage:   "will create candles for missing intervals using stored trade data <true/false>",
 		},
 	},
 }
@@ -4386,37 +4398,41 @@ func getHistoricCandlesExtended(c *cli.Context) error {
 	return nil
 }
 
-var findMissingSavedCandleIntervalsCommand = cli.Command{
+var findMissingSavedCandleIntervalsCommand = &cli.Command{
 	Name:      "findmissingsavedcandleintervals",
 	Usage:     "will highlight any interval that is missing candle data so you can fill that gap",
 	ArgsUsage: "<exchange> <pair> <asset> <interval> <start> <end>",
 	Action:    findMissingSavedCandleIntervals,
 	Flags: []cli.Flag{
-		cli.StringFlag{
-			Name:  "exchange, e",
-			Usage: "the exchange to find the missing candles",
+		&cli.StringFlag{
+			Name:    "exchange",
+			Aliases: []string{"e"},
+			Usage:   "the exchange to find the missing candles",
 		},
-		cli.StringFlag{
-			Name:  "pair, p",
-			Usage: "the currency pair",
+		&cli.StringFlag{
+			Name:    "pair",
+			Aliases: []string{"p"},
+			Usage:   "the currency pair",
 		},
-		cli.StringFlag{
-			Name:  "asset, a",
-			Usage: "the asset type of the currency pair",
+		&cli.StringFlag{
+			Name:    "asset",
+			Aliases: []string{"a"},
+			Usage:   "the asset type of the currency pair",
 		},
-		cli.Int64Flag{
-			Name:        "interval, i",
+		&cli.Int64Flag{
+			Name:        "interval",
+			Aliases:     []string{"i"},
 			Usage:       fmt.Sprintf(klineMessage, "interval"),
 			Value:       86400,
 			Destination: &candleGranularity,
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:        "start",
 			Usage:       "<start> rounded down to the nearest hour",
 			Value:       time.Now().AddDate(0, -1, 0).Truncate(time.Hour).Format(common.SimpleTimeFormat),
 			Destination: &startTime,
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:        "end",
 			Usage:       "<end> rounded down to the nearest hour",
 			Value:       time.Now().Truncate(time.Hour).Format(common.SimpleTimeFormat),
diff --git a/cmd/gctcli/main.go b/cmd/gctcli/main.go
index 185f8477..c08bfa60 100644
--- a/cmd/gctcli/main.go
+++ b/cmd/gctcli/main.go
@@ -11,7 +11,7 @@ import (
 	"github.com/thrasher-corp/gocryptotrader/common"
 	"github.com/thrasher-corp/gocryptotrader/core"
 	"github.com/thrasher-corp/gocryptotrader/gctrpc/auth"
-	"github.com/urfave/cli"
+	cli "github.com/urfave/cli/v2"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 )
@@ -59,38 +59,38 @@ func main() {
 	app.EnableBashCompletion = true
 	app.Usage = "command line interface for managing the gocryptotrader daemon"
 	app.Flags = []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:        "rpchost",
 			Value:       "localhost:9052",
 			Usage:       "the gRPC host to connect to",
 			Destination: &host,
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:        "rpcuser",
 			Value:       "admin",
 			Usage:       "the gRPC username",
 			Destination: &username,
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:        "rpcpassword",
 			Value:       "Password",
 			Usage:       "the gRPC password",
 			Destination: &password,
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:        "delimiter",
 			Value:       "-",
 			Usage:       "the default currency pair delimiter used to standardise currency pair input",
 			Destination: &pairDelimiter,
 		},
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:        "cert",
 			Value:       filepath.Join(common.GetDefaultDataDir(runtime.GOOS), "tls", "cert.pem"),
 			Usage:       "the path to TLS cert of the gRPC server",
 			Destination: &certPath,
 		},
 	}
-	app.Commands = []cli.Command{
+	app.Commands = []*cli.Command{
 		getInfoCommand,
 		getSubsystemsCommand,
 		enableSubsystemCommand,
diff --git a/cmd/gctcli/pair_management.go b/cmd/gctcli/pair_management.go
index 148ae0fd..f5910c32 100644
--- a/cmd/gctcli/pair_management.go
+++ b/cmd/gctcli/pair_management.go
@@ -6,24 +6,24 @@ import (
 
 	"github.com/thrasher-corp/gocryptotrader/currency"
 	"github.com/thrasher-corp/gocryptotrader/gctrpc"
-	"github.com/urfave/cli"
+	cli "github.com/urfave/cli/v2"
 )
 
-var exchangePairManagerCommand = cli.Command{
+var exchangePairManagerCommand = &cli.Command{
 	Name:      "pair",
 	Usage:     "execute exchange pair management command",
 	ArgsUsage: "<command> <args>",
-	Subcommands: []cli.Command{
+	Subcommands: []*cli.Command{
 		{
 			Name:      "get",
 			Usage:     "returns all enabled and available pairs by asset type",
 			ArgsUsage: "<asset>",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "exchange",
 					Usage: "the exchange to act on",
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "asset",
 					Usage: "asset",
 				},
@@ -34,11 +34,11 @@ var exchangePairManagerCommand = cli.Command{
 			Name:  "disableasset",
 			Usage: "disables asset type",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "exchange",
 					Usage: "the exchange to act on",
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "asset",
 					Usage: "asset",
 				},
@@ -49,15 +49,15 @@ var exchangePairManagerCommand = cli.Command{
 			Name:  "enableasset",
 			Usage: "enables asset type",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "exchange",
 					Usage: "the exchange to act on",
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "asset",
 					Usage: "asset",
 				},
-				cli.BoolTFlag{
+				&cli.BoolFlag{
 					Name:   "enable",
 					Hidden: true,
 				},
@@ -68,15 +68,15 @@ var exchangePairManagerCommand = cli.Command{
 			Name:  "disable",
 			Usage: "disable pairs by asset type",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "exchange",
 					Usage: "the exchange to act on",
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "pairs",
 					Usage: "either a single currency pair string or comma delimiter string of pairs e.g. \"BTC-USD,XRP-USD\"",
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "asset",
 					Usage: "asset",
 				},
@@ -87,19 +87,19 @@ var exchangePairManagerCommand = cli.Command{
 			Name:  "enable",
 			Usage: "enable pairs by asset type",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "exchange",
 					Usage: "the exchange to act on",
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "pairs",
 					Usage: "either a single currency pair string or comma delimiter string of pairs e.g. \"BTC-USD,XRP-USD\"",
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "asset",
 					Usage: "asset",
 				},
-				cli.BoolTFlag{
+				&cli.BoolFlag{
 					Name:   "enable",
 					Hidden: true,
 				},
@@ -110,11 +110,11 @@ var exchangePairManagerCommand = cli.Command{
 			Name:  "enableall",
 			Usage: "enable all pairs",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "exchange",
 					Usage: "the exchange to act on",
 				},
-				cli.BoolTFlag{
+				&cli.BoolFlag{
 					Name:   "enable",
 					Hidden: true,
 				},
@@ -125,7 +125,7 @@ var exchangePairManagerCommand = cli.Command{
 			Name:  "disableall",
 			Usage: "dissable all pairs",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "exchange",
 					Usage: "the exchange to act on",
 				},
@@ -136,7 +136,7 @@ var exchangePairManagerCommand = cli.Command{
 			Name:  "update",
 			Usage: "fetches supported pairs from the exchange and updates available pairs and removes unsupported enable pairs",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "exchange",
 					Usage: "the exchange to act on",
 				},
@@ -147,7 +147,7 @@ var exchangePairManagerCommand = cli.Command{
 			Name:  "getassets",
 			Usage: "fetches supported assets",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "exchange",
 					Usage: "the exchange to act on",
 				},
@@ -158,7 +158,7 @@ var exchangePairManagerCommand = cli.Command{
 }
 
 func enableDisableExchangePair(c *cli.Context) error {
-	enable := c.BoolT("enable")
+	enable := c.Bool("enable")
 	if c.NArg() == 0 && c.NumFlags() == 0 {
 		if enable {
 			return cli.ShowCommandHelp(c, "enable")
@@ -292,7 +292,7 @@ func getExchangePairs(c *cli.Context) error {
 }
 
 func enableDisableExchangeAsset(c *cli.Context) error {
-	enable := c.BoolT("enable")
+	enable := c.Bool("enable")
 	if c.NArg() == 0 && c.NumFlags() == 0 {
 		if enable {
 			return cli.ShowCommandHelp(c, "enableasset")
@@ -346,7 +346,7 @@ func enableDisableExchangeAsset(c *cli.Context) error {
 }
 
 func enableDisableAllExchangePairs(c *cli.Context) error {
-	enable := c.BoolT("enable")
+	enable := c.Bool("enable")
 	if c.NArg() == 0 && c.NumFlags() == 0 {
 		if enable {
 			return cli.ShowCommandHelp(c, "enableall")
diff --git a/cmd/gctcli/trades.go b/cmd/gctcli/trades.go
index b6abede5..fbffbaff 100644
--- a/cmd/gctcli/trades.go
+++ b/cmd/gctcli/trades.go
@@ -10,25 +10,26 @@ import (
 	"github.com/thrasher-corp/gocryptotrader/common"
 	"github.com/thrasher-corp/gocryptotrader/currency"
 	"github.com/thrasher-corp/gocryptotrader/gctrpc"
-	"github.com/urfave/cli"
+	cli "github.com/urfave/cli/v2"
 )
 
-var tradeCommand = cli.Command{
+var tradeCommand = &cli.Command{
 	Name:      "trade",
 	Usage:     "execute trade related commands",
 	ArgsUsage: "<command> <args>",
-	Subcommands: []cli.Command{
+	Subcommands: []*cli.Command{
 		{
 			Name:      "setexchangetradeprocessing",
 			Usage:     "sets whether an exchange can save trades to the database",
 			ArgsUsage: "<exchange> <status>",
 			Action:    setExchangeTradeProcessing,
 			Flags: []cli.Flag{
-				cli.StringFlag{
-					Name:  "exchange, e",
-					Usage: "the exchange to change the status of",
+				&cli.StringFlag{
+					Name:    "exchange",
+					Aliases: []string{"e"},
+					Usage:   "the exchange to change the status of",
 				},
-				cli.BoolFlag{
+				&cli.BoolFlag{
 					Name:  "status",
 					Usage: "<true>/<false>",
 				},
@@ -40,17 +41,20 @@ var tradeCommand = cli.Command{
 			ArgsUsage: "<exchange> <pair> <asset>",
 			Action:    getRecentTrades,
 			Flags: []cli.Flag{
-				cli.StringFlag{
-					Name:  "exchange, e",
-					Usage: "the exchange to get the trades from",
+				&cli.StringFlag{
+					Name:    "exchange",
+					Aliases: []string{"e"},
+					Usage:   "the exchange to get the trades from",
 				},
-				cli.StringFlag{
-					Name:  "pair, p",
-					Usage: "the currency pair to get the trades for",
+				&cli.StringFlag{
+					Name:    "pair",
+					Aliases: []string{"p"},
+					Usage:   "the currency pair to get the trades for",
 				},
-				cli.StringFlag{
-					Name:  "asset, a",
-					Usage: "the asset type of the currency pair",
+				&cli.StringFlag{
+					Name:    "asset",
+					Aliases: []string{"a"},
+					Usage:   "the asset type of the currency pair",
 				},
 			},
 		},
@@ -60,25 +64,28 @@ var tradeCommand = cli.Command{
 			ArgsUsage: "<exchange> <pair> <asset> <start> <end>",
 			Action:    getHistoricTrades,
 			Flags: []cli.Flag{
-				cli.StringFlag{
-					Name:  "exchange, e",
-					Usage: "the exchange to get the trades from",
+				&cli.StringFlag{
+					Name:    "exchange",
+					Aliases: []string{"e"},
+					Usage:   "the exchange to get the trades from",
 				},
-				cli.StringFlag{
-					Name:  "pair, p",
-					Usage: "the currency pair to get the trades for",
+				&cli.StringFlag{
+					Name:    "pair",
+					Aliases: []string{"p"},
+					Usage:   "the currency pair to get the trades for",
 				},
-				cli.StringFlag{
-					Name:  "asset, a",
-					Usage: "the asset type of the currency pair",
+				&cli.StringFlag{
+					Name:    "asset",
+					Aliases: []string{"a"},
+					Usage:   "the asset type of the currency pair",
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:        "start",
 					Usage:       "<start>",
 					Value:       time.Now().Add(-time.Hour * 6).Format(common.SimpleTimeFormat),
 					Destination: &startTime,
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:        "end",
 					Usage:       "<end> WARNING: large date ranges may take considerable time",
 					Value:       time.Now().Format(common.SimpleTimeFormat),
@@ -92,25 +99,28 @@ var tradeCommand = cli.Command{
 			ArgsUsage: "<exchange> <pair> <asset> <start> <end>",
 			Action:    getSavedTrades,
 			Flags: []cli.Flag{
-				cli.StringFlag{
-					Name:  "exchange, e",
-					Usage: "the exchange to get the trades from",
+				&cli.StringFlag{
+					Name:    "exchange",
+					Aliases: []string{"e"},
+					Usage:   "the exchange to get the trades from",
 				},
-				cli.StringFlag{
-					Name:  "pair, p",
-					Usage: "the currency pair to get the trades for",
+				&cli.StringFlag{
+					Name:    "pair",
+					Aliases: []string{"p"},
+					Usage:   "the currency pair to get the trades for",
 				},
-				cli.StringFlag{
-					Name:  "asset, a",
-					Usage: "the asset type of the currency pair",
+				&cli.StringFlag{
+					Name:    "asset",
+					Aliases: []string{"a"},
+					Usage:   "the asset type of the currency pair",
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:        "start",
 					Usage:       "<start>",
 					Value:       time.Now().AddDate(0, -1, 0).Format(common.SimpleTimeFormat),
 					Destination: &startTime,
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:        "end",
 					Usage:       "<end>",
 					Value:       time.Now().Format(common.SimpleTimeFormat),
@@ -124,25 +134,28 @@ var tradeCommand = cli.Command{
 			ArgsUsage: "<exchange> <pair> <asset> <start> <end>",
 			Action:    findMissingSavedTradeIntervals,
 			Flags: []cli.Flag{
-				cli.StringFlag{
-					Name:  "exchange, e",
-					Usage: "the exchange to find the missing trades",
+				&cli.StringFlag{
+					Name:    "exchange",
+					Aliases: []string{"e"},
+					Usage:   "the exchange to find the missing trades",
 				},
-				cli.StringFlag{
-					Name:  "pair, p",
-					Usage: "the currency pair",
+				&cli.StringFlag{
+					Name:    "pair",
+					Aliases: []string{"p"},
+					Usage:   "the currency pair",
 				},
-				cli.StringFlag{
-					Name:  "asset, a",
-					Usage: "the asset type of the currency pair",
+				&cli.StringFlag{
+					Name:    "asset",
+					Aliases: []string{"a"},
+					Usage:   "the asset type of the currency pair",
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:        "start",
 					Usage:       "<start> rounded down to the nearest hour",
 					Value:       time.Now().Add(-time.Hour * 24).Truncate(time.Hour).Format(common.SimpleTimeFormat),
 					Destination: &startTime,
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:        "end",
 					Usage:       "<end> rounded down to the nearest hour",
 					Value:       time.Now().Truncate(time.Hour).Format(common.SimpleTimeFormat),
@@ -156,43 +169,49 @@ var tradeCommand = cli.Command{
 			ArgsUsage: "<exchange> <pair> <asset> <interval> <start> <end>",
 			Action:    convertSavedTradesToCandles,
 			Flags: []cli.Flag{
-				cli.StringFlag{
-					Name:  "exchange, e",
-					Usage: "the exchange",
+				&cli.StringFlag{
+					Name:    "exchange",
+					Aliases: []string{"e"},
+					Usage:   "the exchange",
 				},
-				cli.StringFlag{
-					Name:  "pair, p",
-					Usage: "the currency pair to get the trades for",
+				&cli.StringFlag{
+					Name:    "pair",
+					Aliases: []string{"p"},
+					Usage:   "the currency pair to get the trades for",
 				},
-				cli.StringFlag{
-					Name:  "asset, a",
-					Usage: "the asset type of the currency pair",
+				&cli.StringFlag{
+					Name:    "asset",
+					Aliases: []string{"a"},
+					Usage:   "the asset type of the currency pair",
 				},
-				cli.Int64Flag{
-					Name:        "interval, i",
+				&cli.Int64Flag{
+					Name:        "interval",
+					Aliases:     []string{"i"},
 					Usage:       fmt.Sprintf(klineMessage, "interval"),
 					Value:       86400,
 					Destination: &candleGranularity,
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:        "start",
 					Usage:       "<start>",
 					Value:       time.Now().AddDate(0, -1, 0).Format(common.SimpleTimeFormat),
 					Destination: &startTime,
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:        "end",
 					Usage:       "<end>",
 					Value:       time.Now().Format(common.SimpleTimeFormat),
 					Destination: &endTime,
 				},
-				cli.BoolFlag{
-					Name:  "sync, s",
-					Usage: "will sync the resulting candles to the database <true/false>",
+				&cli.BoolFlag{
+					Name:    "sync",
+					Aliases: []string{"s"},
+					Usage:   "will sync the resulting candles to the database <true/false>",
 				},
-				cli.BoolFlag{
-					Name:  "force, f",
-					Usage: "will overwrite any conflicting candle data on save <true/false>",
+				&cli.BoolFlag{
+					Name:    "force",
+					Aliases: []string{"f"},
+					Usage:   "will overwrite any conflicting candle data on save <true/false>",
 				},
 			},
 		},
diff --git a/cmd/gctcli/websocket_management.go b/cmd/gctcli/websocket_management.go
index 8b747e9c..02757a7a 100644
--- a/cmd/gctcli/websocket_management.go
+++ b/cmd/gctcli/websocket_management.go
@@ -5,19 +5,19 @@ import (
 	"fmt"
 
 	"github.com/thrasher-corp/gocryptotrader/gctrpc"
-	"github.com/urfave/cli"
+	cli "github.com/urfave/cli/v2"
 )
 
-var websocketManagerCommand = cli.Command{
+var websocketManagerCommand = &cli.Command{
 	Name:      "websocket",
 	Usage:     "execute websocket management command",
 	ArgsUsage: "<command> <args>",
-	Subcommands: []cli.Command{
+	Subcommands: []*cli.Command{
 		{
 			Name:  "getinfo",
 			Usage: "returns all exchange websocket information",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "exchange",
 					Usage: "the exchange to act on",
 				},
@@ -28,7 +28,7 @@ var websocketManagerCommand = cli.Command{
 			Name:  "disable",
 			Usage: "disables websocket connection for an exchange",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "exchange",
 					Usage: "the exchange to act on",
 				},
@@ -39,11 +39,11 @@ var websocketManagerCommand = cli.Command{
 			Name:  "enable",
 			Usage: "enables websocket connection for an exchange",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "exchange",
 					Usage: "the exchange to act on",
 				},
-				cli.BoolTFlag{
+				&cli.BoolFlag{
 					Name:   "enable",
 					Hidden: true,
 				},
@@ -54,7 +54,7 @@ var websocketManagerCommand = cli.Command{
 			Name:  "getsubs",
 			Usage: "returns current subscriptions for an exchange",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "exchange",
 					Usage: "the exchange to act on",
 				},
@@ -65,11 +65,11 @@ var websocketManagerCommand = cli.Command{
 			Name:  "setproxy",
 			Usage: "sets exchange websocket proxy, flushes and reroutes connection",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "exchange",
 					Usage: "the exchange to act on",
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "proxy",
 					Usage: "proxy address to change to, if proxy string is not set, this will stop the utilization of the prior set proxy.",
 				},
@@ -80,11 +80,11 @@ var websocketManagerCommand = cli.Command{
 			Name:  "seturl",
 			Usage: "sets exchange websocket endpoint URL and resets the websocket connection",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "exchange",
 					Usage: "the exchange to act on",
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "url",
 					Usage: "url string to change to, an empty string will set it back to the packaged defined default",
 				},
@@ -127,7 +127,7 @@ func getwebsocketInfo(c *cli.Context) error {
 }
 
 func enableDisableWebsocket(c *cli.Context) error {
-	enable := c.BoolT("enable")
+	enable := c.Bool("enable")
 	if c.NArg() == 0 && c.NumFlags() == 0 {
 		return cli.ShowSubcommandHelp(c)
 	}
diff --git a/contrib/zsh_autocomplete b/contrib/zsh_autocomplete
deleted file mode 100644
index ed4951b2..00000000
--- a/contrib/zsh_autocomplete
+++ /dev/null
@@ -1,14 +0,0 @@
-# zsh programmable completion for gctcli
-# source zsh_autocomplete
-
-_gctcli() {
-
-  local -a opts
-  opts=("${(@f)$(_CLI_ZSH_AUTOCOMPLETE_HACK=1 ${words[@]:0:#words[@]-1} --generate-bash-completion)}")
-
-  _describe 'values' opts
-
-  return
-}
-
-compdef _gctcli gctcli
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 5c61acf5..e71beabc 100644
--- a/go.mod
+++ b/go.mod
@@ -26,7 +26,6 @@ require (
 	github.com/thrasher-corp/goose v2.7.0-rc4.0.20191002032028-0f2c2a27abdb+incompatible
 	github.com/thrasher-corp/sqlboiler v1.0.1-0.20191001234224-71e17f37a85e
 	github.com/toorop/go-pusher v0.0.0-20180521062818-4521e2eb39fb
-	github.com/urfave/cli v1.22.5
 	github.com/urfave/cli/v2 v2.3.0
 	github.com/volatiletech/inflect v0.0.1 // indirect
 	github.com/volatiletech/null v8.0.0+incompatible
diff --git a/go.sum b/go.sum
index 259d70b5..1360b0f9 100644
--- a/go.sum
+++ b/go.sum
@@ -371,8 +371,6 @@ github.com/toorop/go-pusher v0.0.0-20180521062818-4521e2eb39fb h1:9kcmLvQdiIecpg
 github.com/toorop/go-pusher v0.0.0-20180521062818-4521e2eb39fb/go.mod h1:VTLqNCX1tXrur6pdIRCl8Q90FR7nw/mEBdyMkWMcsb0=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
-github.com/urfave/cli v1.22.5 h1:lNq9sAHXK2qfdI8W+GRItjCEkI+2oR4d+MEHy1CKXoU=
-github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
 github.com/volatiletech/inflect v0.0.0-20170731032912-e7201282ae8d/go.mod h1:jspfvgf53t5NLUT4o9L1IX0kIBNKamGq1tWc/MgWK9Q=