Add currency pair display method to display a currency pair based on user config preferences (e.g BTC-USD or BTCUSD)

2026-05-13 23:16:45 +00:00 · 2017-08-23 14:02:09 +10:00
parent f684b4d19f
commit 7be8c0272b
24 changed files with 142 additions and 25 deletions
--- a/config/config.go
+++ b/config/config.go
@@ -75,16 +75,23 @@ type Post struct {
 	Data Config `json:"Data"`
 }

+// CurrencyPairFormatConfig stores the users preferred currency pair display
+type CurrencyPairFormatConfig struct {
+	Uppercase bool
+	Delimiter string
+}
+
 // Config is the overarching object that holds all the information for
 // prestart management of portfolio, SMSGlobal, webserver and enabled exchange
 type Config struct {
-	Name             string
-	EncryptConfig    int
-	Cryptocurrencies string
-	Portfolio        portfolio.Base   `json:"PortfolioAddresses"`
-	SMS              SMSGlobalConfig  `json:"SMSGlobal"`
-	Webserver        WebserverConfig  `json:"Webserver"`
-	Exchanges        []ExchangeConfig `json:"Exchanges"`
+	Name               string
+	EncryptConfig      int
+	Cryptocurrencies   string
+	CurrencyPairFormat *CurrencyPairFormatConfig `json:"CurrencyPairFormat"`
+	Portfolio          portfolio.Base            `json:"PortfolioAddresses"`
+	SMS                SMSGlobalConfig           `json:"SMSGlobal"`
+	Webserver          WebserverConfig           `json:"Webserver"`
+	Exchanges          []ExchangeConfig          `json:"Exchanges"`
 }

 // ExchangeConfig holds all the information needed for each enabled Exchange.
@@ -114,6 +121,11 @@ func (c *Config) GetConfigEnabledExchanges() int {
 	return counter
 }

+// GetCurrencyPairDisplayConfig retrieves the currency pair display preference
+func (c *Config) GetCurrencyPairDisplayConfig() *CurrencyPairFormatConfig {
+	return c.CurrencyPairFormat
+}
+
 // GetExchangeConfig returns your exchange configurations by its indivdual name
 func (c *Config) GetExchangeConfig(name string) (ExchangeConfig, error) {
 	for i := range c.Exchanges {
@@ -396,6 +408,13 @@ func (c *Config) LoadConfig(configPath string) error {
 		return fmt.Errorf(ErrCheckingConfigValues, err)
 	}

+	if c.CurrencyPairFormat == nil {
+		c.CurrencyPairFormat = &CurrencyPairFormatConfig{
+			Delimiter: "-",
+			Uppercase: true,
+		}
+	}
+
 	return nil
 }

--- a/config/config_test.go
+++ b/config/config_test.go
@@ -19,6 +19,22 @@ func TestGetConfigEnabledExchanges(t *testing.T) {
 	}
 }

+func TestGetCurrencyPairDisplayConfig(t *testing.T) {
+	cfg := GetConfig()
+	err := cfg.LoadConfig(ConfigTestFile)
+	if err != nil {
+		t.Errorf(
+			"Test failed. GetCurrencyPairDisplayConfig. LoadConfig Error: %s", err.Error(),
+		)
+	}
+	settings := cfg.GetCurrencyPairDisplayConfig()
+	if settings.Delimiter != "-" || !settings.Uppercase {
+		t.Errorf(
+			"Test failed. GetCurrencyPairDisplayConfi. Invalid values",
+		)
+	}
+}
+
 func TestGetExchangeConfig(t *testing.T) {
 	GetExchangeConfig := GetConfig()
 	err := GetExchangeConfig.LoadConfig(ConfigTestFile)
--- a/config_example.dat
+++ b/config_example.dat
@@ -2,6 +2,10 @@
 "Name": "Skynet",
 "EncryptConfig": 0,
 "Cryptocurrencies": "BTC,LTC,ETH,XRP,NMC,NVC,PPC,XBT,DOGE,DASH",
+ "CurrencyPairFormat": {
+  "Uppercase": true,
+  "Delimiter": "-"
+ },
 "PortfolioAddresses": {
  "Addresses": [
   {
--- a/currency/pair/pair.go
+++ b/currency/pair/pair.go
@@ -43,6 +43,23 @@ func (c CurrencyPair) Pair() CurrencyItem {
 	return c.FirstCurrency + CurrencyItem(c.Delimiter) + c.SecondCurrency
 }

+// Display formats and returns the currency based on user preferences, 
+// overriding the default Pair() display
+func (c CurrencyPair) Display(delimiter string, uppercase bool) CurrencyItem {
+	var pair CurrencyItem
+
+	if delimiter != "" {
+		pair = c.FirstCurrency + CurrencyItem(delimiter) + c.SecondCurrency
+	} else {
+		pair = c.FirstCurrency + c.SecondCurrency
+	}
+
+	if uppercase {
+		return pair.Upper()
+	}
+	return pair.Lower()
+}
+
 // NewCurrencyPairDelimiter splits the desired currency string at delimeter,
 // the returns a CurrencyPair struct
 func NewCurrencyPairDelimiter(currency, delimiter string) CurrencyPair {
--- a/currency/pair/pair_test.go
+++ b/currency/pair/pair_test.go
@@ -74,6 +74,37 @@ func TestPair(t *testing.T) {
 	}
 }

+func TestDisplay(t *testing.T) {
+	t.Parallel()
+	pair := NewCurrencyPairDelimiter("BTC-USD", "-")
+	actual := pair.Pair()
+	expected := CurrencyItem("BTC-USD")
+	if actual != expected {
+		t.Errorf(
+			"Test failed. Pair(): %s was not equal to expected value: %s",
+			actual, expected,
+		)
+	}
+
+	actual = pair.Display("", false)
+	expected = CurrencyItem("btcusd")
+	if actual != expected {
+		t.Errorf(
+			"Test failed. Pair(): %s was not equal to expected value: %s",
+			actual, expected,
+		)
+	}
+
+	actual = pair.Display("~", true)
+	expected = CurrencyItem("BTC~USD")
+	if actual != expected {
+		t.Errorf(
+			"Test failed. Pair(): %s was not equal to expected value: %s",
+			actual, expected,
+		)
+	}
+}
+
 func TestNewCurrencyPair(t *testing.T) {
 	t.Parallel()
 	pair := NewCurrencyPair("BTC", "USD")
--- a/exchanges/anx/anx_wrapper.go
+++ b/exchanges/anx/anx_wrapper.go
@@ -30,7 +30,7 @@ func (a *ANX) Run() {
 					log.Println(err)
 					return
 				}
-				log.Printf("ANX %s: Last %f High %f Low %f Volume %f\n", currency.Pair(), ticker.Last, ticker.High, ticker.Low, ticker.Volume)
+				log.Printf("ANX %s: Last %f High %f Low %f Volume %f\n", exchange.FormatCurrency(currency).String(), ticker.Last, ticker.High, ticker.Low, ticker.Volume)
 				stats.AddExchangeInfo(a.GetName(), currency.GetFirstCurrency().String(), currency.GetSecondCurrency().String(), ticker.Last, ticker.Volume)
 			}()
 		}
--- a/exchanges/bitfinex/bitfinex_wrapper.go
+++ b/exchanges/bitfinex/bitfinex_wrapper.go
@@ -47,7 +47,7 @@ func (b *Bitfinex) Run() {
 				if err != nil {
 					return
 				}
-				log.Printf("Bitfinex %s Last %f High %f Low %f Volume %f\n", currency.Pair().String(), ticker.Last, ticker.High, ticker.Low, ticker.Volume)
+				log.Printf("Bitfinex %s Last %f High %f Low %f Volume %f\n", exchange.FormatCurrency(currency).String(), ticker.Last, ticker.High, ticker.Low, ticker.Volume)
 				stats.AddExchangeInfo(b.GetName(), currency.GetFirstCurrency().String(), currency.GetSecondCurrency().String(), ticker.Last, ticker.Volume)
 			}()
 		}
--- a/exchanges/bitstamp/bitstamp_wrapper.go
+++ b/exchanges/bitstamp/bitstamp_wrapper.go
@@ -36,7 +36,7 @@ func (b *Bitstamp) Run() {
 					log.Println(err)
 					return
 				}
-				log.Printf("Bitstamp %s: Last %f High %f Low %f Volume %f\n", currency.Pair().String(), ticker.Last, ticker.High, ticker.Low, ticker.Volume)
+				log.Printf("Bitstamp %s: Last %f High %f Low %f Volume %f\n", exchange.FormatCurrency(currency).String(), ticker.Last, ticker.High, ticker.Low, ticker.Volume)
 				stats.AddExchangeInfo(b.GetName(), currency.GetFirstCurrency().String(), currency.GetSecondCurrency().String(), ticker.Last, ticker.Volume)
 			}()
 		}
--- a/exchanges/bittrex/bittrex_wrapper.go
+++ b/exchanges/bittrex/bittrex_wrapper.go
@@ -52,7 +52,7 @@ func (b *Bittrex) Run() {
 					log.Println(err)
 					return
 				}
-				log.Printf("Bittrex %s Last %f Bid %f Ask %f Volume %f\n", currency.Pair().String(), ticker.Last, ticker.Bid, ticker.Ask, ticker.Volume)
+				log.Printf("Bittrex %s Last %f Bid %f Ask %f Volume %f\n", exchange.FormatCurrency(currency).String(), ticker.Last, ticker.Bid, ticker.Ask, ticker.Volume)
 				stats.AddExchangeInfo(b.GetName(), currency.GetFirstCurrency().String(), currency.GetSecondCurrency().String(), ticker.Last, ticker.Volume)
 			}()
 		}
--- a/exchanges/btcc/btcc_wrapper.go
+++ b/exchanges/btcc/btcc_wrapper.go
@@ -36,7 +36,7 @@ func (b *BTCC) Run() {
 					log.Println(err)
 					return
 				}
-				log.Printf("BTCC %s: Last %f High %f Low %f Volume %f\n", currency.Pair().String(), ticker.Last, ticker.High, ticker.Low, ticker.Volume)
+				log.Printf("BTCC %s: Last %f High %f Low %f Volume %f\n", exchange.FormatCurrency(currency).String(), ticker.Last, ticker.High, ticker.Low, ticker.Volume)
 				stats.AddExchangeInfo(b.GetName(), currency.GetFirstCurrency().String(), currency.GetSecondCurrency().String(), ticker.Last, ticker.Volume)
 			}()
 		}
--- a/exchanges/btcmarkets/btcmarkets_wrapper.go
+++ b/exchanges/btcmarkets/btcmarkets_wrapper.go
@@ -33,7 +33,7 @@ func (b *BTCMarkets) Run() {
 				BTCMarketsLastUSD, _ := currency.ConvertCurrency(ticker.Last, "AUD", "USD")
 				BTCMarketsBestBidUSD, _ := currency.ConvertCurrency(ticker.Bid, "AUD", "USD")
 				BTCMarketsBestAskUSD, _ := currency.ConvertCurrency(ticker.Ask, "AUD", "USD")
-				log.Printf("BTC Markets %s: Last %f (%f) Bid %f (%f) Ask %f (%f)\n", curr.Pair().String(), BTCMarketsLastUSD, ticker.Last, BTCMarketsBestBidUSD, ticker.Bid, BTCMarketsBestAskUSD, ticker.Ask)
+				log.Printf("BTC Markets %s: Last %f (%f) Bid %f (%f) Ask %f (%f)\n", exchange.FormatCurrency(curr).String(), BTCMarketsLastUSD, ticker.Last, BTCMarketsBestBidUSD, ticker.Bid, BTCMarketsBestAskUSD, ticker.Ask)
 				stats.AddExchangeInfo(b.GetName(), curr.GetFirstCurrency().String(), curr.GetSecondCurrency().String(), ticker.Last, 0)
 				stats.AddExchangeInfo(b.GetName(), curr.GetFirstCurrency().String(), "USD", BTCMarketsLastUSD, 0)
 			}()
--- a/exchanges/coinut/coinut_wrapper.go
+++ b/exchanges/coinut/coinut_wrapper.go
@@ -54,7 +54,7 @@ func (c *COINUT) Run() {
 					log.Println(err)
 					return
 				}
-				log.Printf("COINUT %s: Last %f High %f Low %f Volume %f\n", currency.Pair().String(), ticker.Last, ticker.High, ticker.Low, ticker.Volume)
+				log.Printf("COINUT %s: Last %f High %f Low %f Volume %f\n", exchange.FormatCurrency(currency).String(), ticker.Last, ticker.High, ticker.Low, ticker.Volume)
 				stats.AddExchangeInfo(c.GetName(), currency.GetFirstCurrency().String(), currency.GetSecondCurrency().String(), ticker.Last, ticker.Volume)
 			}()
 		}
--- a/exchanges/exchange.go
+++ b/exchanges/exchange.go
@@ -85,6 +85,14 @@ func (e *Base) GetEnabledCurrencies() []string {
 	return e.EnabledPairs
 }

+// FormatCurrency is a method that formats and returns a currency pair
+// based on the user currency display preferences
+func FormatCurrency(p pair.CurrencyPair) pair.CurrencyItem {
+	cfg := config.GetConfig()
+	return p.Display(cfg.CurrencyPairFormat.Delimiter,
+		cfg.CurrencyPairFormat.Uppercase)
+}
+
 // SetEnabled is a method that sets if the exchange is enabled
 func (e *Base) SetEnabled(enabled bool) {
 	e.Enabled = enabled
--- a/exchanges/exchange_test.go
+++ b/exchanges/exchange_test.go
@@ -3,6 +3,8 @@ package exchange
 import (
 	"testing"

+	"github.com/thrasher-/gocryptotrader/currency/pair"
+
 	"github.com/thrasher-/gocryptotrader/config"
 )

@@ -30,6 +32,22 @@ func TestGetEnabledCurrencies(t *testing.T) {
 	}
 }

+func TestFormatCurrency(t *testing.T) {
+	cfg := config.GetConfig()
+	err := cfg.LoadConfig(config.ConfigTestFile)
+	if err != nil {
+		t.Fatalf("Failed to load config file. Error: %s", err)
+	}
+
+	currency := pair.NewCurrencyPair("btc", "usd")
+	expected := "BTC-USD"
+	actual := FormatCurrency(currency).String()
+	if actual != expected {
+		t.Errorf("Test failed - Exchange TestFormatCurrency %s != %s",
+			actual, expected)
+	}
+}
+
 func TestSetEnabled(t *testing.T) {
 	SetEnabled := Base{
 		Name:    "TESTNAME",
--- a/exchanges/gdax/gdax_wrapper.go
+++ b/exchanges/gdax/gdax_wrapper.go
@@ -54,7 +54,7 @@ func (g *GDAX) Run() {
 					log.Println(err)
 					return
 				}
-				log.Printf("GDAX %s: Last %f High %f Low %f Volume %f\n", currency.Pair().String(), ticker.Last, ticker.High, ticker.Low, ticker.Volume)
+				log.Printf("GDAX %s: Last %f High %f Low %f Volume %f\n", exchange.FormatCurrency(currency).String(), ticker.Last, ticker.High, ticker.Low, ticker.Volume)
 				stats.AddExchangeInfo(g.GetName(), currency.GetFirstCurrency().String(), currency.GetSecondCurrency().String(), ticker.Last, ticker.Volume)
 			}()
 		}
--- a/exchanges/gemini/gemini_wrapper.go
+++ b/exchanges/gemini/gemini_wrapper.go
@@ -41,7 +41,7 @@ func (g *Gemini) Run() {
 					log.Println(err)
 					return
 				}
-				log.Printf("Gemini %s Last %f Bid %f Ask %f Volume %f\n", currency.Pair().String(), ticker.Last, ticker.Bid, ticker.Ask, ticker.Volume)
+				log.Printf("Gemini %s Last %f Bid %f Ask %f Volume %f\n", exchange.FormatCurrency(currency).String(), ticker.Last, ticker.Bid, ticker.Ask, ticker.Volume)
 				stats.AddExchangeInfo(g.GetName(), currency.GetFirstCurrency().String(), currency.GetSecondCurrency().String(), ticker.Last, ticker.Volume)
 			}()
 		}
--- a/exchanges/huobi/huobi_wrapper.go
+++ b/exchanges/huobi/huobi_wrapper.go
@@ -40,7 +40,7 @@ func (h *HUOBI) Run() {
 				HuobiLastUSD, _ := currency.ConvertCurrency(ticker.Last, "CNY", "USD")
 				HuobiHighUSD, _ := currency.ConvertCurrency(ticker.High, "CNY", "USD")
 				HuobiLowUSD, _ := currency.ConvertCurrency(ticker.Low, "CNY", "USD")
-				log.Printf("Huobi %s: Last %f (%f) High %f (%f) Low %f (%f) Volume %f\n", curr.Pair().String(), HuobiLastUSD, ticker.Last, HuobiHighUSD, ticker.High, HuobiLowUSD, ticker.Low, ticker.Volume)
+				log.Printf("Huobi %s: Last %f (%f) High %f (%f) Low %f (%f) Volume %f\n", exchange.FormatCurrency(curr).String(), HuobiLastUSD, ticker.Last, HuobiHighUSD, ticker.High, HuobiLowUSD, ticker.Low, ticker.Volume)
 				stats.AddExchangeInfo(h.GetName(), curr.GetFirstCurrency().String(), curr.GetSecondCurrency().String(), ticker.Last, ticker.Volume)
 				stats.AddExchangeInfo(h.GetName(), curr.GetFirstCurrency().String(), "USD", HuobiLastUSD, ticker.Volume)
 			}()
--- a/exchanges/itbit/itbit_wrapper.go
+++ b/exchanges/itbit/itbit_wrapper.go
@@ -30,7 +30,7 @@ func (i *ItBit) Run() {
 					log.Println(err)
 					return
 				}
-				log.Printf("ItBit %s: Last %f High %f Low %f Volume %f\n", currency.Pair().String(), ticker.Last, ticker.High, ticker.Low, ticker.Volume)
+				log.Printf("ItBit %s: Last %f High %f Low %f Volume %f\n", exchange.FormatCurrency(currency).String(), ticker.Last, ticker.High, ticker.Low, ticker.Volume)
 				stats.AddExchangeInfo(i.GetName(), currency.GetFirstCurrency().String(), currency.GetSecondCurrency().String(), ticker.Last, ticker.Volume)
 			}()
 		}
--- a/exchanges/lakebtc/lakebtc_wrapper.go
+++ b/exchanges/lakebtc/lakebtc_wrapper.go
@@ -30,7 +30,7 @@ func (l *LakeBTC) Run() {
 				log.Println(err)
 				continue
 			}
-			log.Printf("LakeBTC BTC %s: Last %f High %f Low %f Volume %f\n", x[3:], ticker.Last, ticker.High, ticker.Low, ticker.Volume)
+			log.Printf("LakeBTC %s: Last %f High %f Low %f Volume %f\n", exchange.FormatCurrency(currency).String(), ticker.Last, ticker.High, ticker.Low, ticker.Volume)
 			stats.AddExchangeInfo(l.GetName(), currency.GetFirstCurrency().String(), currency.GetSecondCurrency().String(), ticker.Last, ticker.Volume)
 		}
 		time.Sleep(time.Second * l.RESTPollingDelay)
--- a/exchanges/liqui/liqui_wrapper.go
+++ b/exchanges/liqui/liqui_wrapper.go
@@ -52,7 +52,7 @@ func (l *Liqui) Run() {
 			}
 			for x, y := range ticker {
 				currency := pair.NewCurrencyPairDelimiter(common.StringToUpper(x), "_")
-				log.Printf("Liqui %s: Last %f High %f Low %f Volume %f\n", currency.Pair().String(), y.Last, y.High, y.Low, y.Vol_cur)
+				log.Printf("Liqui %s: Last %f High %f Low %f Volume %f\n", exchange.FormatCurrency(currency).String(), y.Last, y.High, y.Low, y.Vol_cur)
 				l.Ticker[x] = y
 				stats.AddExchangeInfo(l.GetName(), currency.GetFirstCurrency().String(), currency.GetSecondCurrency().String(), y.Last, y.Vol_cur)
 			}
--- a/exchanges/localbitcoins/localbitcoins_wrapper.go
+++ b/exchanges/localbitcoins/localbitcoins_wrapper.go
@@ -31,7 +31,7 @@ func (l *LocalBitcoins) Run() {
 				return
 			}

-			log.Printf("LocalBitcoins BTC %s: Last %f Volume %f\n", currency.Pair().String(), ticker.Last, ticker.Volume)
+			log.Printf("LocalBitcoins BTC %s: Last %f Volume %f\n", exchange.FormatCurrency(currency).String(), ticker.Last, ticker.Volume)
 			stats.AddExchangeInfo(l.GetName(), currency.GetFirstCurrency().String(), currency.GetSecondCurrency().String(), ticker.Last, ticker.Volume)
 		}
 		time.Sleep(time.Second * l.RESTPollingDelay)
--- a/exchanges/okcoin/okcoin_wrapper.go
+++ b/exchanges/okcoin/okcoin_wrapper.go
@@ -41,7 +41,7 @@ func (o *OKCoin) Run() {
 							log.Println(err)
 							return
 						}
-						log.Printf("OKCoin Intl Futures %s (%s): Last %f High %f Low %f Volume %f\n", curr.Pair().String(), futuresValue, ticker.Last, ticker.High, ticker.Low, ticker.Vol)
+						log.Printf("OKCoin Intl Futures %s (%s): Last %f High %f Low %f Volume %f\n", exchange.FormatCurrency(curr).String(), futuresValue, ticker.Last, ticker.High, ticker.Low, ticker.Vol)
 						stats.AddExchangeInfo(o.GetName(), curr.GetFirstCurrency().String(), curr.GetSecondCurrency().String(), ticker.Last, ticker.Vol)
 					}()
 				}
@@ -51,7 +51,7 @@ func (o *OKCoin) Run() {
 						log.Println(err)
 						return
 					}
-					log.Printf("OKCoin Intl Spot %s: Last %f High %f Low %f Volume %f\n", curr.Pair().String(), ticker.Last, ticker.High, ticker.Low, ticker.Volume)
+					log.Printf("OKCoin Intl Spot %s: Last %f High %f Low %f Volume %f\n", exchange.FormatCurrency(curr).String(), ticker.Last, ticker.High, ticker.Low, ticker.Volume)
 					stats.AddExchangeInfo(o.GetName(), curr.GetFirstCurrency().String(), curr.GetSecondCurrency().String(), ticker.Last, ticker.Volume)
 				}()
 			} else {
@@ -64,7 +64,7 @@ func (o *OKCoin) Run() {
 					tickerLastUSD, _ := currency.ConvertCurrency(ticker.Last, "CNY", "USD")
 					tickerHighUSD, _ := currency.ConvertCurrency(ticker.High, "CNY", "USD")
 					tickerLowUSD, _ := currency.ConvertCurrency(ticker.Low, "CNY", "USD")
-					log.Printf("OKCoin China %s: Last %f (%f) High %f (%f) Low %f (%f) Volume %f\n", curr.Pair().String(), tickerLastUSD, ticker.Last, tickerHighUSD, ticker.High, tickerLowUSD, ticker.Low, ticker.Volume)
+					log.Printf("OKCoin China %s: Last %f (%f) High %f (%f) Low %f (%f) Volume %f\n", exchange.FormatCurrency(curr).String(), tickerLastUSD, ticker.Last, tickerHighUSD, ticker.High, tickerLowUSD, ticker.Low, ticker.Volume)
 					stats.AddExchangeInfo(o.GetName(), curr.GetFirstCurrency().String(), curr.GetSecondCurrency().String(), ticker.Last, ticker.Volume)
 					stats.AddExchangeInfo(o.GetName(), curr.GetFirstCurrency().String(), "USD", tickerLastUSD, ticker.Volume)
 				}()
--- a/exchanges/poloniex/poloniex_wrapper.go
+++ b/exchanges/poloniex/poloniex_wrapper.go
@@ -36,7 +36,7 @@ func (p *Poloniex) Run() {
 					log.Println(err)
 					return
 				}
-				log.Printf("Poloniex %s Last %f High %f Low %f Volume %f\n", currency.Pair().String(), ticker.Last, ticker.High, ticker.Low, ticker.Volume)
+				log.Printf("Poloniex %s Last %f High %f Low %f Volume %f\n", exchange.FormatCurrency(currency).String(), ticker.Last, ticker.High, ticker.Low, ticker.Volume)
 				stats.AddExchangeInfo(p.GetName(), currency.GetFirstCurrency().String(), currency.GetSecondCurrency().String(), ticker.Last, ticker.Volume)
 			}()
 		}
--- a/testdata/configtest.dat
+++ b/testdata/configtest.dat
@@ -2,6 +2,10 @@
 "Name": "Skynet",
 "EncryptConfig": 0,
 "Cryptocurrencies": "BTC,LTC,ETH,XRP,NMC,NVC,PPC,XBT,DOGE,DASH",
+ "CurrencyPairFormat": {
+  "Uppercase": true,
+  "Delimiter": "-"
+ },
 "PortfolioAddresses": {
  "Addresses": [
   {