Currency package update (#247)

* Initial currency overhaul before service system implementation

* Remove redundant currency string in orderbook.Base
Unexport lastupdated field in orderbook.Base as it was being instantiated multiple times
Add error handling for process orderbook

*  Remove redundant currency string in ticker.Price
 Unexport lastupdated field in ticker.Price
 Add error handling for process ticker function and fix tests

* Phase Two Update

* Update translations to use map type - thankyou to kempeng for spotting this

* Change pair method name from Display -> Format for better readability

* Fixes misspelling and tests

* Implement requested changes from GloriousCode

* Remove reduntant function and streamlined return in currency_translation.go

* Revert pair method naming conventions

* Change currency naming conventions

* Changed code type to exported Item type with underlying string to reduce complexity

* Added interim orderbook process method to orderbook.Base type

* Changed feebuilder struct field to currency.Pair

* Adds fall over system for backup fx providers

* deprecate function and children and fix linter issue with btcmarkets

* Fixed requested changes

* Fix bug and move mtx for rates

* Fixed after rebase oopsies

* Fix linter issues

* Fixes race conditions in testing functions

* Final phase coinmarketcap update

* fix linter issues

* Implement requested changes

* Adds configuration variables to increase/decrease time durations between updating currency file and fetching new currency rates

* Add a collection of tests to improve codecov

* After rebase oopsy fixes for btse

* Fix requested changes

* fix after rebase oopsies and add more efficient comparison checks within currency pair

* Fix linter issues

exchanges/kraken/kraken.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/thrasher-/gocryptotrader/common"
 	"github.com/thrasher-/gocryptotrader/config"
+	"github.com/thrasher-/gocryptotrader/currency"
 	exchange "github.com/thrasher-/gocryptotrader/exchanges"
 	"github.com/thrasher-/gocryptotrader/exchanges/request"
 	"github.com/thrasher-/gocryptotrader/exchanges/ticker"
@@ -99,9 +100,9 @@ func (k *Kraken) Setup(exch config.ExchangeConfig) {
 		k.SetHTTPClientUserAgent(exch.HTTPUserAgent)
 		k.RESTPollingDelay = exch.RESTPollingDelay
 		k.Verbose = exch.Verbose
-		k.BaseCurrencies = common.SplitStrings(exch.BaseCurrencies, ",")
-		k.AvailablePairs = common.SplitStrings(exch.AvailablePairs, ",")
-		k.EnabledPairs = common.SplitStrings(exch.EnabledPairs, ",")
+		k.BaseCurrencies = exch.BaseCurrencies
+		k.AvailablePairs = exch.AvailablePairs
+		k.EnabledPairs = exch.EnabledPairs
 		err := k.SetCurrencyPairFormat()
 		if err != nil {
 			log.Fatal(err)
@@ -912,7 +913,8 @@ func (k *Kraken) SendHTTPRequest(path string, result interface{}) error {
 // SendAuthenticatedHTTPRequest sends an authenticated HTTP request
 func (k *Kraken) SendAuthenticatedHTTPRequest(method string, params url.Values, result interface{}) (err error) {
 	if !k.AuthenticatedAPISupport {
-		return fmt.Errorf(exchange.WarningAuthenticatedRequestWithoutCredentialsSet, k.Name)
+		return fmt.Errorf(exchange.WarningAuthenticatedRequestWithoutCredentialsSet,
+			k.Name)
 	}
 
 	path := fmt.Sprintf("/%s/private/%s", krakenAPIVersion, method)
@@ -931,39 +933,57 @@ func (k *Kraken) SendAuthenticatedHTTPRequest(method string, params url.Values,
 
 	encoded := params.Encode()
 	shasum := common.GetSHA256([]byte(params.Get("nonce") + encoded))
-	signature := common.Base64Encode(common.GetHMAC(common.HashSHA512, append([]byte(path), shasum...), secret))
+	signature := common.Base64Encode(common.GetHMAC(common.HashSHA512,
+		append([]byte(path), shasum...), secret))
 
 	if k.Verbose {
-		log.Debugf("Sending POST request to %s, path: %s, params: %s", k.APIUrl, path, encoded)
+		log.Debugf("Sending POST request to %s, path: %s, params: %s",
+			k.APIUrl,
+			path,
+			encoded)
 	}
 
 	headers := make(map[string]string)
 	headers["API-Key"] = k.APIKey
 	headers["API-Sign"] = signature
 
-	return k.SendPayload(http.MethodPost, k.APIUrl+path, headers, strings.NewReader(encoded), result, true, k.Verbose)
+	return k.SendPayload(http.MethodPost,
+		k.APIUrl+path,
+		headers,
+		strings.NewReader(encoded),
+		result,
+		true,
+		k.Verbose)
 }
 
 // GetFee returns an estimate of fee based on type of transaction
 func (k *Kraken) GetFee(feeBuilder exchange.FeeBuilder) (float64, error) {
 	var fee float64
-	currency := feeBuilder.FirstCurrency + feeBuilder.Delimiter + feeBuilder.SecondCurrency
+	c := feeBuilder.Pair.Base.String() +
+		feeBuilder.Pair.Delimiter +
+		feeBuilder.Pair.Quote.String()
 
 	switch feeBuilder.FeeType {
 	case exchange.CryptocurrencyTradeFee:
-		feePair, err := k.GetTradeVolume(true, currency)
+		feePair, err := k.GetTradeVolume(true, c)
 		if err != nil {
 			return 0, err
 		}
 		if feeBuilder.IsMaker {
-			fee = calculateTradingFee(currency, feePair.FeesMaker, feeBuilder.PurchasePrice, feeBuilder.Amount)
+			fee = calculateTradingFee(c,
+				feePair.FeesMaker,
+				feeBuilder.PurchasePrice,
+				feeBuilder.Amount)
 		} else {
-			fee = calculateTradingFee(currency, feePair.Fees, feeBuilder.PurchasePrice, feeBuilder.Amount)
+			fee = calculateTradingFee(c,
+				feePair.Fees,
+				feeBuilder.PurchasePrice,
+				feeBuilder.Amount)
 		}
 	case exchange.CryptocurrencyWithdrawalFee:
-		fee = getWithdrawalFee(feeBuilder.FirstCurrency)
+		fee = getWithdrawalFee(feeBuilder.Pair.Base)
 	case exchange.InternationalBankDepositFee:
-		depositMethods, err := k.GetDepositMethods(feeBuilder.CurrencyItem)
+		depositMethods, err := k.GetDepositMethods(feeBuilder.FiatCurrency.String())
 		if err != nil {
 			return 0, err
 		}
@@ -977,10 +997,10 @@ func (k *Kraken) GetFee(feeBuilder exchange.FeeBuilder) (float64, error) {
 			}
 		}
 	case exchange.CyptocurrencyDepositFee:
-		fee = getCryptocurrencyDepositFee(feeBuilder.FirstCurrency)
+		fee = getCryptocurrencyDepositFee(feeBuilder.Pair.Base)
 
 	case exchange.InternationalBankWithdrawalFee:
-		fee = getWithdrawalFee(feeBuilder.CurrencyItem)
+		fee = getWithdrawalFee(feeBuilder.FiatCurrency)
 	}
 	if fee < 0 {
 		fee = 0
@@ -989,12 +1009,12 @@ func (k *Kraken) GetFee(feeBuilder exchange.FeeBuilder) (float64, error) {
 	return fee, nil
 }
 
-func getWithdrawalFee(currency string) float64 {
-	return WithdrawalFees[currency]
+func getWithdrawalFee(c currency.Code) float64 {
+	return WithdrawalFees[c]
 }
 
-func getCryptocurrencyDepositFee(currency string) float64 {
-	return DepositFees[currency]
+func getCryptocurrencyDepositFee(c currency.Code) float64 {
+	return DepositFees[c]
 }
 
 func calculateTradingFee(currency string, feePair map[string]TradeVolumeFee, purchasePrice, amount float64) float64 {
@@ -1025,14 +1045,14 @@ func (k *Kraken) GetCryptoDepositAddress(method, code string) (string, error) {
 }
 
 // WithdrawStatus gets the status of recent withdrawals
-func (k *Kraken) WithdrawStatus(currency, method string) ([]WithdrawStatusResponse, error) {
+func (k *Kraken) WithdrawStatus(c currency.Code, method string) ([]WithdrawStatusResponse, error) {
 	var response struct {
 		Error  []string                 `json:"error"`
 		Result []WithdrawStatusResponse `json:"result"`
 	}
 
 	params := url.Values{}
-	params.Set("asset ", currency)
+	params.Set("asset ", c.String())
 	if method != "" {
 		params.Set("method", method)
 	}
@@ -1045,14 +1065,14 @@ func (k *Kraken) WithdrawStatus(currency, method string) ([]WithdrawStatusRespon
 }
 
 // WithdrawCancel sends a withdrawal cancelation request
-func (k *Kraken) WithdrawCancel(currency, refID string) (bool, error) {
+func (k *Kraken) WithdrawCancel(c currency.Code, refID string) (bool, error) {
 	var response struct {
 		Error  []string `json:"error"`
 		Result bool     `json:"result"`
 	}
 
 	params := url.Values{}
-	params.Set("asset ", currency)
+	params.Set("asset ", c.String())
 	params.Set("refid", refID)
 
 	if err := k.SendAuthenticatedHTTPRequest(krakenWithdrawCancel, params, &response); err != nil {

exchanges/kraken/kraken_test.go

@@ -4,8 +4,7 @@ import (
 	"testing"
 
 	"github.com/thrasher-/gocryptotrader/config"
-	"github.com/thrasher-/gocryptotrader/currency/pair"
-	"github.com/thrasher-/gocryptotrader/currency/symbol"
+	"github.com/thrasher-/gocryptotrader/currency"
 	exchange "github.com/thrasher-/gocryptotrader/exchanges"
 )
 
@@ -224,13 +223,10 @@ func TestCancelExistingOrder(t *testing.T) {
 func setFeeBuilder() exchange.FeeBuilder {
 	return exchange.FeeBuilder{
 		Amount:              1,
-		Delimiter:           "",
 		FeeType:             exchange.CryptocurrencyTradeFee,
-		FirstCurrency:       symbol.XXBT,
-		SecondCurrency:      symbol.ZUSD,
-		IsMaker:             false,
+		Pair:                currency.NewPair(currency.XXBT, currency.ZUSD),
 		PurchasePrice:       1,
-		CurrencyItem:        symbol.USD,
+		FiatCurrency:        currency.USD,
 		BankTransactionType: exchange.WireTransfer,
 	}
 }
@@ -284,7 +280,7 @@ func TestGetFee(t *testing.T) {
 	// CyptocurrencyDepositFee Basic
 	feeBuilder = setFeeBuilder()
 	feeBuilder.FeeType = exchange.CyptocurrencyDepositFee
-	feeBuilder.FirstCurrency = symbol.XXBT
+	feeBuilder.Pair.Base = currency.XXBT
 	if resp, err := k.GetFee(feeBuilder); resp != float64(0) || err != nil {
 		t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(5), resp)
 		t.Error(err)
@@ -300,7 +296,7 @@ func TestGetFee(t *testing.T) {
 
 	// CryptocurrencyWithdrawalFee Invalid currency
 	feeBuilder = setFeeBuilder()
-	feeBuilder.FirstCurrency = "hello"
+	feeBuilder.Pair.Base = currency.NewCode("hello")
 	feeBuilder.FeeType = exchange.CryptocurrencyWithdrawalFee
 	if resp, err := k.GetFee(feeBuilder); resp != float64(0) || err != nil {
 		t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(0), resp)
@@ -310,7 +306,7 @@ func TestGetFee(t *testing.T) {
 	// InternationalBankWithdrawalFee Basic
 	feeBuilder = setFeeBuilder()
 	feeBuilder.FeeType = exchange.InternationalBankWithdrawalFee
-	feeBuilder.CurrencyItem = symbol.USD
+	feeBuilder.FiatCurrency = currency.USD
 	if resp, err := k.GetFee(feeBuilder); resp != float64(5) || err != nil {
 		t.Errorf("Test Failed - GetFee() error. Expected: %f, Received: %f", float64(5), resp)
 		t.Error(err)
@@ -378,10 +374,10 @@ func TestSubmitOrder(t *testing.T) {
 		t.Skip("API keys set, canManipulateRealOrders false, skipping test")
 	}
 
-	var p = pair.CurrencyPair{
-		Delimiter:      "",
-		FirstCurrency:  symbol.XBT,
-		SecondCurrency: symbol.CAD,
+	var p = currency.Pair{
+		Delimiter: "",
+		Base:      currency.XBT,
+		Quote:     currency.CAD,
 	}
 	response, err := k.SubmitOrder(p, exchange.BuyOrderSide, exchange.MarketOrderType, 1, 10, "hi")
 	if areTestAPIKeysSet() && (err != nil || !response.IsOrderPlaced) {
@@ -399,7 +395,7 @@ func TestCancelExchangeOrder(t *testing.T) {
 		t.Skip("API keys set, canManipulateRealOrders false, skipping test")
 	}
 
-	currencyPair := pair.NewCurrencyPair(symbol.LTC, symbol.BTC)
+	currencyPair := currency.NewPair(currency.LTC, currency.BTC)
 
 	var orderCancellation = exchange.OrderCancellation{
 		OrderID:       "1",
@@ -425,7 +421,7 @@ func TestCancelAllExchangeOrders(t *testing.T) {
 		t.Skip("API keys set, canManipulateRealOrders false, skipping test")
 	}
 
-	currencyPair := pair.NewCurrencyPair(symbol.LTC, symbol.BTC)
+	currencyPair := currency.NewPair(currency.LTC, currency.BTC)
 
 	var orderCancellation = exchange.OrderCancellation{
 		OrderID:       "1",
@@ -474,7 +470,7 @@ func TestWithdraw(t *testing.T) {
 	TestSetup(t)
 	var withdrawCryptoRequest = exchange.WithdrawRequest{
 		Amount:        100,
-		Currency:      symbol.XXBT,
+		Currency:      currency.XXBT,
 		Address:       "1F5zVDgNjorJ51oGebSvNCrSAHpwGkUdDB",
 		Description:   "donation",
 		TradePassword: "Key",
@@ -503,7 +499,7 @@ func TestWithdrawFiat(t *testing.T) {
 
 	var withdrawFiatRequest = exchange.WithdrawRequest{
 		Amount:        100,
-		Currency:      symbol.EUR,
+		Currency:      currency.EUR,
 		Address:       "",
 		Description:   "donation",
 		TradePassword: "someBank",
@@ -528,7 +524,7 @@ func TestWithdrawInternationalBank(t *testing.T) {
 
 	var withdrawFiatRequest = exchange.WithdrawRequest{
 		Amount:        100,
-		Currency:      symbol.EUR,
+		Currency:      currency.EUR,
 		Address:       "",
 		Description:   "donation",
 		TradePassword: "someBank",
@@ -545,12 +541,12 @@ func TestWithdrawInternationalBank(t *testing.T) {
 
 func TestGetDepositAddress(t *testing.T) {
 	if areTestAPIKeysSet() {
-		_, err := k.GetDepositAddress(symbol.BTC, "")
+		_, err := k.GetDepositAddress(currency.BTC, "")
 		if err != nil {
 			t.Error("Test Failed - GetDepositAddress() error", err)
 		}
 	} else {
-		_, err := k.GetDepositAddress(symbol.BTC, "")
+		_, err := k.GetDepositAddress(currency.BTC, "")
 		if err == nil {
 			t.Error("Test Failed - GetDepositAddress() error can not be nil")
 		}
@@ -562,12 +558,12 @@ func TestWithdrawStatus(t *testing.T) {
 	TestSetup(t)
 
 	if areTestAPIKeysSet() {
-		_, err := k.WithdrawStatus(symbol.BTC, "")
+		_, err := k.WithdrawStatus(currency.BTC, "")
 		if err != nil {
 			t.Error("Test Failed - WithdrawStatus() error", err)
 		}
 	} else {
-		_, err := k.WithdrawStatus(symbol.BTC, "")
+		_, err := k.WithdrawStatus(currency.BTC, "")
 		if err == nil {
 			t.Error("Test Failed - GetDepositAddress() error can not be nil", err)
 		}
@@ -578,7 +574,7 @@ func TestWithdrawCancel(t *testing.T) {
 	k.SetDefaults()
 	TestSetup(t)
 
-	_, err := k.WithdrawCancel(symbol.BTC, "")
+	_, err := k.WithdrawCancel(currency.BTC, "")
 	if areTestAPIKeysSet() && err == nil {
 		t.Error("Test Failed - WithdrawCancel() error cannot be nil")
 	} else if !areTestAPIKeysSet() && err == nil {

exchanges/kraken/kraken_types.go

@@ -1,6 +1,6 @@
 package kraken
 
-import "github.com/thrasher-/gocryptotrader/currency/symbol"
+import "github.com/thrasher-/gocryptotrader/currency"
 
 // TimeResponse type
 type TimeResponse struct {
@@ -331,39 +331,39 @@ type CancelOrderResponse struct {
 
 // DepositFees the large list of predefined deposit fees
 // Prone to change
-var DepositFees = map[string]float64{
-	symbol.XTZ: 0.05,
+var DepositFees = map[currency.Code]float64{
+	currency.XTZ: 0.05,
 }
 
 // WithdrawalFees the large list of predefined withdrawal fees
 // Prone to change
-var WithdrawalFees = map[string]float64{
-	symbol.ZUSD: 5,
-	symbol.ZEUR: 5,
-	symbol.USD:  5,
-	symbol.EUR:  5,
-	symbol.REP:  0.01,
-	symbol.XXBT: 0.0005,
-	symbol.BTC:  0.0005,
-	symbol.XBT:  0.0005,
-	symbol.BCH:  0.0001,
-	symbol.ADA:  0.3,
-	symbol.DASH: 0.005,
-	symbol.XDG:  2,
-	symbol.EOS:  0.05,
-	symbol.ETH:  0.005,
-	symbol.ETC:  0.005,
-	symbol.GNO:  0.005,
-	symbol.ICN:  0.2,
-	symbol.LTC:  0.001,
-	symbol.MLN:  0.003,
-	symbol.XMR:  0.05,
-	symbol.QTUM: 0.01,
-	symbol.XRP:  0.02,
-	symbol.XLM:  0.00002,
-	symbol.USDT: 5,
-	symbol.XTZ:  0.05,
-	symbol.ZEC:  0.0001,
+var WithdrawalFees = map[currency.Code]float64{
+	currency.ZUSD: 5,
+	currency.ZEUR: 5,
+	currency.USD:  5,
+	currency.EUR:  5,
+	currency.REP:  0.01,
+	currency.XXBT: 0.0005,
+	currency.BTC:  0.0005,
+	currency.XBT:  0.0005,
+	currency.BCH:  0.0001,
+	currency.ADA:  0.3,
+	currency.DASH: 0.005,
+	currency.XDG:  2,
+	currency.EOS:  0.05,
+	currency.ETH:  0.005,
+	currency.ETC:  0.005,
+	currency.GNO:  0.005,
+	currency.ICN:  0.2,
+	currency.LTC:  0.001,
+	currency.MLN:  0.003,
+	currency.XMR:  0.05,
+	currency.QTUM: 0.01,
+	currency.XRP:  0.02,
+	currency.XLM:  0.00002,
+	currency.USDT: 5,
+	currency.XTZ:  0.05,
+	currency.ZEC:  0.0001,
 }
 
 // DepositAddress defines a deposit address

exchanges/kraken/kraken_wrapper.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/thrasher-/gocryptotrader/common"
-	"github.com/thrasher-/gocryptotrader/currency/pair"
+	"github.com/thrasher-/gocryptotrader/currency"
 	exchange "github.com/thrasher-/gocryptotrader/exchanges"
 	"github.com/thrasher-/gocryptotrader/exchanges/orderbook"
 	"github.com/thrasher-/gocryptotrader/exchanges/ticker"
@@ -36,7 +36,8 @@ func (k *Kraken) Run() {
 		log.Errorf("%s Failed to get available symbols.\n", k.GetName())
 	} else {
 		forceUpgrade := false
-		if !common.StringDataContains(k.EnabledPairs, "-") || !common.StringDataContains(k.AvailablePairs, "-") {
+		if !common.StringDataContains(k.EnabledPairs.Strings(), "-") ||
+			!common.StringDataContains(k.AvailablePairs.Strings(), "-") {
 			forceUpgrade = true
 		}
 
@@ -57,7 +58,9 @@ func (k *Kraken) Run() {
 		}
 
 		if forceUpgrade {
-			enabledPairs := []string{"XBT-USD"}
+			enabledPairs := currency.Pairs{currency.Pair{
+				Base: currency.XBT, Quote: currency.USD, Delimiter: "-"}}
+
 			log.Warn("Available pairs for Kraken reset due to config upgrade, please enable the ones you would like again")
 
 			err = k.UpdateCurrencies(enabledPairs, true, true)
@@ -65,7 +68,14 @@ func (k *Kraken) Run() {
 				log.Errorf("%s Failed to get config.\n", k.GetName())
 			}
 		}
-		err = k.UpdateCurrencies(exchangeProducts, false, forceUpgrade)
+
+		var newExchangeProducts currency.Pairs
+		for _, p := range exchangeProducts {
+			newExchangeProducts = append(newExchangeProducts,
+				currency.NewPairFromString(p))
+		}
+
+		err = k.UpdateCurrencies(newExchangeProducts, false, forceUpgrade)
 		if err != nil {
 			log.Errorf("%s Failed to get config.\n", k.GetName())
 		}
@@ -73,21 +83,22 @@ func (k *Kraken) Run() {
 }
 
 // UpdateTicker updates and returns the ticker for a currency pair
-func (k *Kraken) UpdateTicker(p pair.CurrencyPair, assetType string) (ticker.Price, error) {
+func (k *Kraken) UpdateTicker(p currency.Pair, assetType string) (ticker.Price, error) {
 	var tickerPrice ticker.Price
 	pairs := k.GetEnabledCurrencies()
 	pairsCollated, err := exchange.GetAndFormatExchangeCurrencies(k.Name, pairs)
 	if err != nil {
 		return tickerPrice, err
 	}
-	tickers, err := k.GetTickers(pairsCollated.String())
+	tickers, err := k.GetTickers(pairsCollated)
 	if err != nil {
 		return tickerPrice, err
 	}
 
 	for _, x := range pairs {
 		for y, z := range tickers {
-			if !common.StringContains(y, x.FirstCurrency.Upper().String()) && !common.StringContains(y, x.SecondCurrency.Upper().String()) {
+			if !common.StringContains(y, x.Base.Upper().String()) &&
+				!common.StringContains(y, x.Quote.Upper().String()) {
 				continue
 			}
 			var tp ticker.Price
@@ -98,14 +109,14 @@ func (k *Kraken) UpdateTicker(p pair.CurrencyPair, assetType string) (ticker.Pri
 			tp.High = z.High
 			tp.Low = z.Low
 			tp.Volume = z.Volume
-			ticker.ProcessTicker(k.GetName(), x, tp, assetType)
+			ticker.ProcessTicker(k.GetName(), tp, assetType)
 		}
 	}
 	return ticker.GetTicker(k.GetName(), p, assetType)
 }
 
 // GetTickerPrice returns the ticker for a currency pair
-func (k *Kraken) GetTickerPrice(p pair.CurrencyPair, assetType string) (ticker.Price, error) {
+func (k *Kraken) GetTickerPrice(p currency.Pair, assetType string) (ticker.Price, error) {
 	tickerNew, err := ticker.GetTicker(k.GetName(), p, assetType)
 	if err != nil {
 		return k.UpdateTicker(p, assetType)
@@ -114,8 +125,8 @@ func (k *Kraken) GetTickerPrice(p pair.CurrencyPair, assetType string) (ticker.P
 }
 
 // GetOrderbookEx returns orderbook base on the currency pair
-func (k *Kraken) GetOrderbookEx(p pair.CurrencyPair, assetType string) (orderbook.Base, error) {
-	ob, err := orderbook.GetOrderbook(k.GetName(), p, assetType)
+func (k *Kraken) GetOrderbookEx(p currency.Pair, assetType string) (orderbook.Base, error) {
+	ob, err := orderbook.Get(k.GetName(), p, assetType)
 	if err != nil {
 		return k.UpdateOrderbook(p, assetType)
 	}
@@ -123,7 +134,7 @@ func (k *Kraken) GetOrderbookEx(p pair.CurrencyPair, assetType string) (orderboo
 }
 
 // UpdateOrderbook updates and returns the orderbook for a currency pair
-func (k *Kraken) UpdateOrderbook(p pair.CurrencyPair, assetType string) (orderbook.Base, error) {
+func (k *Kraken) UpdateOrderbook(p currency.Pair, assetType string) (orderbook.Base, error) {
 	var orderBook orderbook.Base
 	orderbookNew, err := k.GetDepth(exchange.FormatExchangeCurrency(k.GetName(), p).String())
 	if err != nil {
@@ -138,8 +149,16 @@ func (k *Kraken) UpdateOrderbook(p pair.CurrencyPair, assetType string) (orderbo
 		orderBook.Asks = append(orderBook.Asks, orderbook.Item{Amount: orderbookNew.Asks[x].Amount, Price: orderbookNew.Asks[x].Price})
 	}
 
-	orderbook.ProcessOrderbook(k.GetName(), p, orderBook, assetType)
-	return orderbook.GetOrderbook(k.Name, p, assetType)
+	orderBook.Pair = p
+	orderBook.ExchangeName = k.GetName()
+	orderBook.AssetType = assetType
+
+	err = orderBook.Process()
+	if err != nil {
+		return orderBook, err
+	}
+
+	return orderbook.Get(k.Name, p, assetType)
 }
 
 // GetAccountInfo retrieves balances for all enabled currencies for the
@@ -156,7 +175,7 @@ func (k *Kraken) GetAccountInfo() (exchange.AccountInfo, error) {
 	var balances []exchange.AccountCurrencyInfo
 	for key, data := range bal {
 		balances = append(balances, exchange.AccountCurrencyInfo{
-			CurrencyName: key,
+			CurrencyName: currency.NewCode(key),
 			TotalValue:   data,
 		})
 	}
@@ -176,18 +195,25 @@ func (k *Kraken) GetFundingHistory() ([]exchange.FundHistory, error) {
 }
 
 // GetExchangeHistory returns historic trade data since exchange opening.
-func (k *Kraken) GetExchangeHistory(p pair.CurrencyPair, assetType string) ([]exchange.TradeHistory, error) {
+func (k *Kraken) GetExchangeHistory(p currency.Pair, assetType string) ([]exchange.TradeHistory, error) {
 	var resp []exchange.TradeHistory
 
 	return resp, common.ErrNotYetImplemented
 }
 
 // SubmitOrder submits a new order
-func (k *Kraken) SubmitOrder(p pair.CurrencyPair, side exchange.OrderSide, orderType exchange.OrderType, amount, price float64, _ string) (exchange.SubmitOrderResponse, error) {
+func (k *Kraken) SubmitOrder(p currency.Pair, side exchange.OrderSide, orderType exchange.OrderType, amount, price float64, _ string) (exchange.SubmitOrderResponse, error) {
 	var submitOrderResponse exchange.SubmitOrderResponse
 	var args = AddOrderOptions{}
 
-	response, err := k.AddOrder(p.Pair().String(), side.ToString(), orderType.ToString(), amount, price, 0, 0, args)
+	response, err := k.AddOrder(p.String(),
+		side.ToString(),
+		orderType.ToString(),
+		amount,
+		price,
+		0,
+		0,
+		args)
 
 	if len(response.TransactionIds) > 0 {
 		submitOrderResponse.OrderID = strings.Join(response.TransactionIds, ", ")
@@ -243,7 +269,7 @@ func (k *Kraken) GetOrderInfo(orderID string) (exchange.OrderDetail, error) {
 }
 
 // GetDepositAddress returns a deposit address for a specified currency
-func (k *Kraken) GetDepositAddress(cryptocurrency pair.CurrencyItem, _ string) (string, error) {
+func (k *Kraken) GetDepositAddress(cryptocurrency currency.Code, _ string) (string, error) {
 	methods, err := k.GetDepositMethods(cryptocurrency.String())
 	if err != nil {
 		return "", err
@@ -298,7 +324,8 @@ func (k *Kraken) GetActiveOrders(getOrdersRequest exchange.GetOrdersRequest) ([]
 
 	var orders []exchange.OrderDetail
 	for ID, order := range resp.Open {
-		symbol := pair.NewCurrencyPairDelimiter(order.Descr.Pair, k.ConfigCurrencyPairFormat.Delimiter)
+		symbol := currency.NewPairDelimiter(order.Descr.Pair,
+			k.ConfigCurrencyPairFormat.Delimiter)
 		orderDate := time.Unix(int64(order.StartTm), 0)
 		side := exchange.OrderSide(strings.ToUpper(order.Descr.Type))
 
@@ -315,7 +342,8 @@ func (k *Kraken) GetActiveOrders(getOrdersRequest exchange.GetOrdersRequest) ([]
 		})
 	}
 
-	exchange.FilterOrdersByTickRange(&orders, getOrdersRequest.StartTicks, getOrdersRequest.EndTicks)
+	exchange.FilterOrdersByTickRange(&orders, getOrdersRequest.StartTicks,
+		getOrdersRequest.EndTicks)
 	exchange.FilterOrdersBySide(&orders, getOrdersRequest.OrderSide)
 	exchange.FilterOrdersByCurrencies(&orders, getOrdersRequest.Currencies)
 
@@ -340,7 +368,8 @@ func (k *Kraken) GetOrderHistory(getOrdersRequest exchange.GetOrdersRequest) ([]
 
 	var orders []exchange.OrderDetail
 	for ID, order := range resp.Closed {
-		symbol := pair.NewCurrencyPairDelimiter(order.Descr.Pair, k.ConfigCurrencyPairFormat.Delimiter)
+		symbol := currency.NewPairDelimiter(order.Descr.Pair,
+			k.ConfigCurrencyPairFormat.Delimiter)
 		orderDate := time.Unix(int64(order.StartTm), 0)
 		side := exchange.OrderSide(strings.ToUpper(order.Descr.Type))