Various improvements, update config

config_example.json

@@ -19,7 +19,7 @@
    {
     "Address": "3Nxwenay9Z8Lc9JBiywExpnEFiLp6Afp8v",
     "CoinType": "BTC",
-    "Balance": 83348.33585928,
+    "Balance": 90348.33585928,
     "Description": ""
    },
    {
@@ -308,12 +308,13 @@
    "AuthenticatedAPISupport": false,
    "APIKey": "Key",
    "APISecret": "Secret",
-   "AvailablePairs": "BTCUSD,ETHBTC,ETHUSD",
-   "EnabledPairs": "BTCUSD",
+   "AvailablePairs": "BCN-BTC,BTC-USD,DASH-BTC,DOGE-BTC,DOGE-USD,DSH-BTC,EMC-BTC,ETH-BTC,FCN-BTC,LSK-BTC,LTC-BTC,LTC-USD,NXT-BTC,QCN-BTC,SBD-BTC,SC-BTC,STEEM-BTC,XDN-BTC,XEM-BTC,XMR-BTC,ARDR-BTC,ZEC-BTC,WAVES-BTC,MAID-BTC,AMP-BTC,BUS-BTC,DGD-BTC,ICN-BTC,SNGLS-BTC,1ST-BTC,TRST-BTC,TIME-BTC,GNO-BTC,REP-BTC,XMR-USD,DASH-USD,ETH-USD,NXT-USD,ZRC-BTC,BOS-BTC,DCT-BTC,ANT-BTC,AEON-BTC,GUP-BTC,PLU-BTC,LUN-BTC,TAAS-BTC,NXC-BTC,EDG-BTC,RLC-BTC,SWT-BTC,TKN-BTC,WINGS-BTC,XAUR-BTC,AE-BTC,PTOY-BTC,ZEC-USD,XEM-USD,BCN-USD,XDN-USD,MAID-USD,ETC-BTC,ETC-USD,CFI-BTC,PLBT-BTC,BNT-BTC,XDNCO-BTC,FYN-ETH,SNM-ETH,SNT-ETH,CVC-USD,PAY-ETH,OAX-ETH,OMG-ETH,BQX-ETH,XTZ-BTC,DICE-BTC,CFI-ETH,PTOY-ETH,1ST-ETH,XAUR-ETH,TAAS-ETH,TIME-ETH,DICE-ETH,SWT-ETH,XMR-ETH,ETC-ETH,DASH-ETH,ZEC-ETH,PLU-ETH,GNO-ETH,XRP-BTC,NET-ETH,STRAT-USD,STRAT-BTC,SNC-ETH,ADX-ETH,BET-ETH,EOS-ETH,DENT-ETH,SAN-ETH,EOS-BTC,EOS-USD,MNE-BTC,MSP-ETH,DDF-ETH,XTZ-ETH,XTZ-USD,UET-ETH,MYB-ETH,SUR-ETH,IXT-ETH,PLR-ETH,TIX-ETH,NDC-ETH,PRO-ETH,AVT-ETH,COSS-ETH,EVX-USD,DLT-BTC,BNT-ETH,BNT-USD,QAU-BTC,QAU-ETH,MANA-USD,DNT-BTC,FYP-BTC,OPT-BTC,TNT-ETH,STX-BTC,STX-ETH,STX-USD,TNT-USD,TNT-BTC,CAT-BTC,CAT-ETH,CAT-USD,BCH-BTC,BCH-ETH,BCH-USD,ENG-ETH,XUC-USD,SNC-BTC,SNC-USD,OAX-USD,OAX-BTC,BAS-ETH,ZRX-BTC,ZRX-ETH,ZRX-USD,RVT-BTC,ICOS-BTC,ICOS-ETH,ICOS-USD,PPC-BTC,PPC-USD,QTUM-ETH,VERI-BTC,VERI-ETH,VERI-USD,IGNIS-ETH,PRG-BTC,PRG-ETH,PRG-USD,BMC-BTC,BMC-ETH,BMC-USD,CND-BTC,CND-ETH,CND-USD,SKIN-BTC,EMGO-BTC,EMGO-USD,CDT-ETH,CDT-USD,FUN-BTC,FUN-ETH,FUN-USD,HVN-BTC,HVN-ETH,FUEL-BTC,FUEL-ETH,FUEL-USD,POE-BTC,POE-ETH,MCAP-BTC,AIR-BTC,AIR-ETH,AIR-USD,NTO-BTC,ICO-BTC,PING-BTC,RKC-ETH,GAME-BTC,TKR-ETH,HPC-BTC,PPT-ETH,MTH-BTC,MTH-ETH,WMGO-BTC,WMGO-USD,LRC-BTC,LRC-ETH,ICX-BTC,ICX-ETH,NEO-BTC,NEO-ETH,NEO-USD,CSNO-BTC,ORME-BTC,ICX-USD,PIX-BTC,PIX-ETH,IND-ETH,KICK-BTC,YOYOW-BTC,MIPS-BTC,CDT-BTC,XVG-BTC,XVG-ETH,XVG-USD,DGB-BTC,DGB-ETH,DGB-USD,DCN-ETH,DCN-USD,LAT-BTC,CCT-ETH,EBET-ETH,VIBE-BTC,VOISE-BTC,ENJ-BTC,ENJ-ETH,ENJ-USD,ZSC-BTC,ZSC-ETH,ZSC-USD,ETBS-BTC,TRX-BTC,TRX-ETH,TRX-USD,VEN-BTC,VEN-ETH,VEN-USD,ART-BTC,EVX-BTC,EVX-ETH,QVT-ETH,EBTCOLD-BTC,EBTCOLD-ETH,EBTCOLD-USD,BKB-BTC,EXN-BTC,TGT-BTC,ATS-ETH,UGT-BTC,UGT-ETH,UGT-USD,CTR-BTC,CTR-ETH,CTR-USD,BMT-BTC,BMT-ETH,SUB-BTC,SUB-ETH,SUB-USD,WTC-BTC,CNX-BTC,ATB-BTC,ATB-ETH,ATB-USD,ODN-BTC,BTM-BTC,BTM-ETH,BTM-USD,B2X-BTC,B2X-ETH,B2X-USD,ATM-BTC,ATM-ETH,ATM-USD,LIFE-BTC,VIB-BTC,VIB-ETH,VIB-USD,DRT-ETH,STU-USD,HDG-ETH,OMG-BTC,PAY-BTC,COSS-BTC,PPT-BTC,SNT-BTC,BTG-BTC,BTG-ETH,BTG-USD,SMART-BTC,SMART-ETH,SMART-USD,XUC-ETH,XUC-BTC,CL-BTC,CL-ETH,CL-USD,LA-ETH,CLD-BTC,CLD-ETH,CLD-USD,ELM-BTC,EDO-BTC,EDO-ETH,EDO-USD,HGT-ETH,POLL-BTC,IXT-BTC,ATS-BTC,SCL-BTC,ATL-BTC,EBTC-BTC,EBTC-ETH,EBTC-USD,ETP-BTC,ETP-ETH,ETP-USD,OTX-BTC,CDX-ETH,DRPU-BTC,NEBL-BTC,NEBL-ETH,HAC-BTC,CTX-BTC,CTX-ETH,ELE-BTC,ARN-BTC,ARN-ETH,SISA-BTC,SISA-ETH,STU-BTC,STU-ETH,GVT-ETH,INDI-BTC,BTX-BTC,BTX-USD,LTC-ETH,BCN-ETH,MAID-ETH,NXT-ETH,STRAT-ETH,XDN-ETH,XEM-ETH,PLR-BTC,SUR-BTC,BQX-BTC,DOGE-ETH,ITS-BTC,AMM-BTC,AMM-ETH,AMM-USD,DBIX-BTC,PRE-BTC,KBR-BTC,TBT-BTC,ERO-BTC,SMS-BTC,SMS-ETH,SMS-USD,ZAP-BTC,DOV-BTC,DOV-ETH,FRD-BTC,DRPU-ETH,OTN-BTC,XRP-ETH,XRP-USD,HSR-BTC,LEND-BTC,LEND-ETH,SPF-ETH,SBTC-BTC,SBTC-ETH,BTCA-BTC,BTCA-ETH,BTCA-USD,WRC-BTC,WRC-ETH,WRC-USD,LOC-BTC,LOC-ETH,LOC-USD,SWFTC-BTC,SWFTC-ETH,SWFTC-USD,STAR-ETH,SBTC-USD,STORM-BTC,DIM-ETH,DIM-USD,DIM-BTC,NGC-BTC,NGC-ETH,NGC-USD,EMC-ETH,EMC-USD,MCO-BTC,MCO-ETH,MCO-USD,MANA-ETH,MANA-BTC,ECH-BTC,CPAY-ETH,DATA-BTC,DATA-ETH,DATA-USD,UTT-BTC,UTT-ETH,UTT-USD,KMD-BTC,KMD-ETH,KMD-USD,QTUM-USD,QTUM-BTC,SNT-USD,OMG-USD,EKO-BTC,EKO-ETH,ADX-BTC,ADX-USD,LSK-ETH,LSK-USD,PLR-USD,SUR-USD,BQX-USD,DRT-USD,REP-ETH,REP-USD,C20-BTC,C20-ETH,IDH-BTC,IDH-ETH,IPL-BTC,EET-BTC,EET-ETH,EET-USD,ULTC-BTC,WAX-BTC,WAX-ETH,WAX-USD,TIO-BTC,TIO-ETH,TIO-USD,COV-BTC,COV-ETH,W3C-BTC,W3C-ETH,SMT-BTC,SMT-ETH,SMT-USD,GRMD-BTC,CHAT-BTC,CHAT-ETH,CHAT-USD,AVH-BTC,TRAC-ETH,CAS-BTC,CAS-USD,CAS-ETH",
+   "EnabledPairs": "BTC-USD",
    "BaseCurrencies": "USD",
    "AssetTypes": "SPOT",
    "ConfigCurrencyPairFormat": {
-    "Uppercase": true
+    "Uppercase": true,
+    "Delimiter": "-"
    },
    "RequestCurrencyPairFormat": {
     "Uppercase": true
@@ -329,7 +330,7 @@
    "AuthenticatedAPISupport": false,
    "APIKey": "Key",
    "APISecret": "Secret",
-   "AvailablePairs": "OMG-USDT,LINK-BTC,NAS-ETH,EOS-ETH,SWFTC-BTC,XEM-USDT,ZEC-USDT,DASH-BTC,PAY-BTC,EVX-BTC,MDS-ETH,TNT-BTC,QASH-ETH,SMT-ETH,TRX-ETH,THETA-USDT,LUN-ETH,RUFF-ETH,BCH-BTC,ELA-ETH,IOST-ETH,TNB-BTC,GNX-ETH,THETA-BTC,SNT-USDT,DAT-BTC,SOC-ETH,EOS-USDT,CHAT-ETH,MANA-BTC,SMT-USDT,XRP-BTC,LTC-USDT,QTUM-USDT,LET-BTC,BCD-BTC,SNT-BTC,CVC-USDT,ELF-ETH,GNT-ETH,UTK-BTC,SBTC-BTC,NEO-USDT,MCO-BTC,OST-ETH,HT-BTC,RCN-BTC,BT2-BTC,QUN-BTC,HSR-ETH,TOPC-ETH,SALT-ETH,AIDOC-ETH,WAX-BTC,CVC-ETH,DTA-ETH,BTC-USDT,MEE-ETH,POWR-ETH,GAS-ETH,ADX-ETH,NEO-BTC,SALT-BTC,LET-USDT,BTM-BTC,EKO-ETH,BAT-ETH,EKO-BTC,SRN-BTC,APPC-BTC,OCN-ETH,CMT-BTC,VEN-ETH,QTUM-ETH,REQ-BTC,BIFI-BTC,BTM-ETH,ICX-BTC,OCN-BTC,ZEC-BTC,ACT-BTC,DGD-ETH,DAT-ETH,ETC-USDT,OST-BTC,IOST-USDT,STK-ETH,MCO-ETH,HT-ETH,STORJ-BTC,HSR-BTC,QUN-ETH,SOC-BTC,ELF-BTC,CMT-ETH,VEN-BTC,GNT-BTC,DBC-BTC,STORJ-USDT,WAX-ETH,TRX-BTC,POWR-BTC,DTA-BTC,ZIL-BTC,MEE-BTC,NAS-BTC,TNB-ETH,SWFTC-ETH,LTC-BTC,EOS-BTC,LINK-ETH,IOST-BTC,YEE-BTC,HT-USDT,RUFF-BTC,RDN-BTC,LUN-BTC,GNX-BTC,ELA-BTC,LET-ETH,EVX-ETH,AST-BTC,ACT-ETH,BCH-USDT,DASH-USDT,ICX-ETH,BCX-BTC,PROPY-ETH,DGD-BTC,XRP-USDT,ZIL-ETH,ZRX-BTC,THETA-ETH,ETH-BTC,DBC-ETH,REQ-ETH,WICC-ETH,SMT-BTC,RPX-BTC,TNT-ETH,SRN-ETH,ETH-USDT,ITC-BTC,OMG-BTC,PAY-ETH,STK-BTC,VEN-USDT,MDS-BTC,ADX-BTC,ETC-BTC,AIDOC-BTC,KNC-BTC,HSR-USDT,QTUM-BTC,CVC-BTC,QSP-BTC,QSP-ETH,BTG-BTC,BAT-BTC,ZLA-ETH,QASH-BTC,ITC-ETH,XEM-BTC,MANA-ETH,GAS-BTC,CHAT-BTC,BT1-BTC,ZLA-BTC,OMG-ETH,RCN-ETH,UTK-ETH,TOPC-BTC,MTL-BTC,GNT-USDT,APPC-ETH,PROPY-BTC,WICC-BTC,RDN-ETH,ELF-USDT,YEE-ETH",
+   "AvailablePairs": "OMG-USDT,LINK-BTC,NAS-ETH,EOS-ETH,SWFTC-BTC,XEM-USDT,ZEC-USDT,DASH-BTC,PAY-BTC,EVX-BTC,MDS-ETH,TNT-BTC,QASH-ETH,SMT-ETH,TRX-ETH,THETA-USDT,LUN-ETH,RUFF-ETH,BCH-BTC,ELA-ETH,IOST-ETH,TNB-BTC,GNX-ETH,THETA-BTC,SNT-USDT,DAT-BTC,SOC-ETH,EOS-USDT,CHAT-ETH,MANA-BTC,SMT-USDT,XRP-BTC,LTC-USDT,QTUM-USDT,LET-BTC,BCD-BTC,SNT-BTC,CVC-USDT,ELF-ETH,GNT-ETH,UTK-BTC,SBTC-BTC,NEO-USDT,MCO-BTC,OST-ETH,HT-BTC,RCN-BTC,BT2-BTC,QUN-BTC,HSR-ETH,TOPC-ETH,SALT-ETH,AIDOC-ETH,WAX-BTC,CVC-ETH,DTA-ETH,BTC-USDT,MEE-ETH,POWR-ETH,GAS-ETH,ADX-ETH,NEO-BTC,SALT-BTC,LET-USDT,BTM-BTC,EKO-ETH,BAT-ETH,EKO-BTC,SRN-BTC,APPC-BTC,OCN-ETH,CMT-BTC,VEN-ETH,QTUM-ETH,REQ-BTC,BIFI-BTC,BTM-ETH,ICX-BTC,OCN-BTC,ZEC-BTC,ACT-BTC,DGD-ETH,DAT-ETH,ETC-USDT,OST-BTC,IOST-USDT,STK-ETH,MCO-ETH,HT-ETH,STORJ-BTC,HSR-BTC,QUN-ETH,SOC-BTC,ELF-BTC,CMT-ETH,VEN-BTC,GNT-BTC,DBC-BTC,STORJ-USDT,WAX-ETH,TRX-BTC,POWR-BTC,DTA-USDT,DTA-BTC,SNC-BTC,ZIL-BTC,MEE-BTC,LSK-BTC,NAS-BTC,TNB-ETH,SWFTC-ETH,LTC-BTC,EOS-BTC,LINK-ETH,IOST-BTC,YEE-BTC,HT-USDT,RUFF-BTC,RDN-BTC,LUN-BTC,GNX-BTC,ELA-BTC,LET-ETH,EVX-ETH,AST-BTC,ACT-ETH,BCH-USDT,DASH-USDT,ICX-ETH,BCX-BTC,PROPY-ETH,DGD-BTC,XRP-USDT,ZIL-ETH,ZRX-BTC,THETA-ETH,ETH-BTC,SNC-ETH,DBC-ETH,REQ-ETH,WICC-ETH,SMT-BTC,LSK-ETH,RPX-BTC,TNT-ETH,SRN-ETH,ETH-USDT,ITC-BTC,OMG-BTC,PAY-ETH,STK-BTC,VEN-USDT,MDS-BTC,ADX-BTC,ETC-BTC,AIDOC-BTC,KNC-BTC,HSR-USDT,QTUM-BTC,CVC-BTC,QSP-BTC,QSP-ETH,BTG-BTC,BAT-BTC,ZLA-ETH,QASH-BTC,ITC-ETH,XEM-BTC,MANA-ETH,GAS-BTC,CHAT-BTC,BT1-BTC,ZLA-BTC,OMG-ETH,RCN-ETH,UTK-ETH,TOPC-BTC,MTL-BTC,GNT-USDT,APPC-ETH,PROPY-BTC,WICC-BTC,RDN-ETH,ELF-USDT,YEE-ETH",
    "EnabledPairs": "BTC-USDT",
    "BaseCurrencies": "USD",
    "AssetTypes": "SPOT",

exchanges/hitbtc/hitbtc.go

@@ -56,7 +56,7 @@ func (p *HitBTC) SetDefaults() {
 	p.RESTPollingDelay = 10
 	p.RequestCurrencyPairFormat.Delimiter = ""
 	p.RequestCurrencyPairFormat.Uppercase = true
-	p.ConfigCurrencyPairFormat.Delimiter = ""
+	p.ConfigCurrencyPairFormat.Delimiter = "-"
 	p.ConfigCurrencyPairFormat.Uppercase = true
 	p.AssetTypes = []string{ticker.Spot}
 }
@@ -73,16 +73,9 @@ func (p *HitBTC) Setup(exch config.ExchangeConfig) {
 		p.Verbose = exch.Verbose
 		p.Websocket = exch.Websocket
 		p.BaseCurrencies = common.SplitStrings(exch.BaseCurrencies, ",")
-		availiableSymbols, err := p.GetSymbols("")
-
-		if err != nil {
-			log.Println(err)
-			p.AvailablePairs = common.SplitStrings(exch.AvailablePairs, ",")
-		} else {
-			p.AvailablePairs = availiableSymbols
-		}
+		p.AvailablePairs = common.SplitStrings(exch.AvailablePairs, ",")
 		p.EnabledPairs = common.SplitStrings(exch.EnabledPairs, ",")
-		err = p.SetCurrencyPairFormat()
+		err := p.SetCurrencyPairFormat()
 		if err != nil {
 			log.Fatal(err)
 		}
@@ -136,29 +129,76 @@ func (p *HitBTC) GetSymbols(symbol string) ([]string, error) {
 	return ret, err
 }
 
+// GetSymbolsDetailed is the same as above but returns an array of symbols with
+// all ther details.
+func (p *HitBTC) GetSymbolsDetailed() ([]Symbol, error) {
+	resp := []Symbol{}
+	path := fmt.Sprintf("%s/%s", APIURL, APIv2Symbol)
+	return resp, common.SendHTTPGetRequest(path, true, p.Verbose, &resp)
+}
+
 // GetTicker
 // Return ticker information
-func (p *HitBTC) GetTicker(symbol string) map[string]Ticker {
+func (p *HitBTC) GetTicker(symbol string) (map[string]Ticker, error) {
 
-	resp1 := []Ticker{}
-	resp2 := Ticker{}
-	ret := make(map[string]Ticker)
+	resp1 := []TickerResponse{}
+	resp2 := TickerResponse{}
+	ret := make(map[string]TickerResponse)
+	result := make(map[string]Ticker)
 	path := fmt.Sprintf("%s/%s/%s", APIURL, APIv2Ticker, symbol)
+	var err error
 
 	if symbol == "" {
-		common.SendHTTPGetRequest(path, true, p.Verbose, &resp1)
+		err = common.SendHTTPGetRequest(path, true, false, &resp1)
+		if err != nil {
+			return nil, err
+		}
 
 		for _, item := range resp1 {
 			if item.Symbol != "" {
 				ret[item.Symbol] = item
 			}
 		}
 	} else {
-		common.SendHTTPGetRequest(path, true, p.Verbose, &resp2)
+		err = common.SendHTTPGetRequest(path, true, false, &resp2)
 		ret[resp2.Symbol] = resp2
 	}
 
-	return ret
+	if err == nil {
+		for x, y := range ret {
+			tick := Ticker{}
+
+			ask, _ := strconv.ParseFloat(y.Ask, 64)
+			tick.Ask = ask
+
+			bid, _ := strconv.ParseFloat(y.Bid, 64)
+			tick.Bid = bid
+
+			high, _ := strconv.ParseFloat(y.High, 64)
+			tick.High = high
+
+			last, _ := strconv.ParseFloat(y.Last, 64)
+			tick.Last = last
+
+			low, _ := strconv.ParseFloat(y.Low, 64)
+			tick.Low = low
+
+			open, _ := strconv.ParseFloat(y.Open, 64)
+			tick.Open = open
+
+			vol, _ := strconv.ParseFloat(y.Volume, 64)
+			tick.Volume = vol
+
+			volQuote, _ := strconv.ParseFloat(y.VolumeQuote, 64)
+			tick.VolumeQuote = volQuote
+
+			tick.Symbol = y.Symbol
+			tick.Timestamp = y.Timestamp
+			result[x] = tick
+		}
+	}
+
+	return result, err
 }
 
 // GetTrades returns trades from hitbtc

exchanges/hitbtc/hitbtc_types.go

@@ -3,16 +3,29 @@ package hitbtc
 import "time"
 
 type Ticker struct {
-	Last        float64   `json:"last,string"`        // Last trade price
-	Ask         float64   `json:"ask,string"`         // Best ask price
-	Bid         float64   `json:"bid,string"`         // Best bid price
-	Timestamp   time.Time `json:"timestamp,string"`   // Last update or refresh ticker timestamp
-	Volume      float64   `json:"volume,string"`      // Total trading amount within 24 hours in base currency
-	VolumeQuote float64   `json:"volumeQuote,string"` // Total trading amount within 24 hours in quote currency
+	Last        float64
+	Ask         float64
+	Bid         float64
+	Timestamp   time.Time
+	Volume      float64
+	VolumeQuote float64
+	Symbol      string
+	High        float64
+	Low         float64
+	Open        float64
+}
+
+type TickerResponse struct {
+	Last        string    `json:"last"`             // Last trade price
+	Ask         string    `json:"ask"`              // Best ask price
+	Bid         string    `json:"bid"`              // Best bid price
+	Timestamp   time.Time `json:"timestamp,string"` // Last update or refresh ticker timestamp
+	Volume      string    `json:"volume"`           // Total trading amount within 24 hours in base currency
+	VolumeQuote string    `json:"volumeQuote"`      // Total trading amount within 24 hours in quote currency
 	Symbol      string    `json:"symbol"`
-	High        float64   `json:"high,string"` // Highest trade price within 24 hours
-	Low         float64   `json:"low,string"`  // Lowest trade price within 24 hours
-	Open        float64   `json:"open,string"` // Last trade price 24 hours ago
+	High        string    `json:"high"` // Highest trade price within 24 hours
+	Low         string    `json:"low"`  // Lowest trade price within 24 hours
+	Open        string    `json:"open"` // Last trade price 24 hours ago
 }
 
 type Symbol struct {

exchanges/hitbtc/hitbtc_wrapper.go

@@ -26,11 +26,42 @@ func (p *HitBTC) Run() {
 	if p.Websocket {
 		go p.WebsocketClient()
 	}
+
+	exchangeProducts, err := p.GetSymbolsDetailed()
+	if err != nil {
+		log.Printf("%s Failed to get available symbols.\n", p.GetName())
+	} else {
+		forceUpgrade := false
+		if !common.DataContains(p.EnabledPairs, "-") || !common.DataContains(p.AvailablePairs, "-") {
+			forceUpgrade = true
+		}
+		var currencies []string
+		for x := range exchangeProducts {
+			currencies = append(currencies, exchangeProducts[x].BaseCurrency+"-"+exchangeProducts[x].QuoteCurrency)
+		}
+
+		if forceUpgrade {
+			enabledPairs := []string{"BTC-USD"}
+			log.Println("WARNING: Available pairs for HitBTC reset due to config upgrade, please enable the ones you would like again.")
+
+			err = p.UpdateEnabledCurrencies(enabledPairs, true)
+			if err != nil {
+				log.Printf("%s Failed to update enabled currencies.\n", p.GetName())
+			}
+		}
+		err = p.UpdateAvailableCurrencies(currencies, forceUpgrade)
+		if err != nil {
+			log.Printf("%s Failed to update available currencies.\n", p.GetName())
+		}
+	}
 }
 
 // UpdateTicker updates and returns the ticker for a currency pair
 func (p *HitBTC) UpdateTicker(currencyPair pair.CurrencyPair, assetType string) (ticker.Price, error) {
-	tick := p.GetTicker("")
+	tick, err := p.GetTicker("")
+	if err != nil {
+		return ticker.Price{}, err
+	}
 
 	for _, x := range p.GetEnabledCurrencies() {
 		var tp ticker.Price
@@ -59,7 +90,7 @@ func (p *HitBTC) GetTickerPrice(currencyPair pair.CurrencyPair, assetType string
 // GetOrderbookEx returns orderbook base on the currency pair
 func (p *HitBTC) GetOrderbookEx(currencyPair pair.CurrencyPair, assetType string) (orderbook.Base, error) {
 	ob, err := orderbook.GetOrderbook(p.GetName(), currencyPair, assetType)
-	if err == nil {
+	if err != nil {
 		return p.UpdateOrderbook(currencyPair, assetType)
 	}
 	return ob, nil

exchanges/okex/okex_wrapper.go

@@ -31,6 +31,10 @@ func (o *OKEX) UpdateTicker(p pair.CurrencyPair, assetType string) (ticker.Price
 	var tickerPrice ticker.Price
 
 	if assetType != ticker.Spot {
+		if p.SecondCurrency.String() == common.StringToLower("USDT") {
+			p.SecondCurrency = "usd"
+			currency = exchange.FormatExchangeCurrency(o.Name, p).String()
+		}
 		tick, err := o.GetContractPrice(currency, assetType)
 		if err != nil {
 			return tickerPrice, err
@@ -45,6 +49,11 @@ func (o *OKEX) UpdateTicker(p pair.CurrencyPair, assetType string) (ticker.Price
 		tickerPrice.High = tick.Ticker.High
 		ticker.ProcessTicker(o.GetName(), p, tickerPrice, assetType)
 	} else {
+		if p.SecondCurrency.String() == common.StringToLower("USD") {
+			p.SecondCurrency = "usdt"
+			currency = exchange.FormatExchangeCurrency(o.Name, p).String()
+		}
+
 		tick, err := o.GetSpotTicker(currency)
 		if err != nil {
 			return tickerPrice, err
@@ -86,6 +95,10 @@ func (o *OKEX) UpdateOrderbook(p pair.CurrencyPair, assetType string) (orderbook
 	currency := exchange.FormatExchangeCurrency(o.Name, p).String()
 
 	if assetType != ticker.Spot {
+		if p.SecondCurrency.String() == common.StringToLower("USDT") {
+			p.SecondCurrency = "usd"
+			currency = exchange.FormatExchangeCurrency(o.Name, p).String()
+		}
 		orderbookNew, err := o.GetContractMarketDepth(currency, assetType)
 		if err != nil {
 			return orderBook, err
@@ -102,6 +115,11 @@ func (o *OKEX) UpdateOrderbook(p pair.CurrencyPair, assetType string) (orderbook
 		}
 
 	} else {
+		if p.SecondCurrency.String() == common.StringToLower("USD") {
+			p.SecondCurrency = "usdt"
+			currency = exchange.FormatExchangeCurrency(o.Name, p).String()
+		}
+
 		orderbookNew, err := o.GetSpotMarketDepth(currency, "200")
 		if err != nil {
 			return orderBook, err

exchanges/yobit/yobit_wrapper.go

@@ -64,7 +64,7 @@ func (y *Yobit) GetTickerPrice(p pair.CurrencyPair, assetType string) (ticker.Pr
 // GetOrderbookEx returns the orderbook for a currency pair
 func (y *Yobit) GetOrderbookEx(p pair.CurrencyPair, assetType string) (orderbook.Base, error) {
 	ob, err := orderbook.GetOrderbook(y.GetName(), p, assetType)
-	if err == nil {
+	if err != nil {
 		return y.UpdateOrderbook(p, assetType)
 	}
 	return ob, nil

main.go

@@ -96,8 +96,8 @@ func main() {
 	if len(bot.exchanges) == 0 {
 		log.Fatalf("No exchanges were able to be loaded. Exiting")
 	}
-	// TODO: Fix hack, allow 2 seconds to update exchange settings
-	time.Sleep(time.Second * 2)
+	// TODO: Fix hack, allow 5 seconds to update exchange settings
+	time.Sleep(time.Second * 5)
 
 	if bot.config.CurrencyExchangeProvider == "yahoo" {
 		currency.SetProvider(true)