added us domain

.golangci.yml

@@ -21,6 +21,5 @@ linters:
     - bodyclose
     - depguard
     - goimports
-    - dupl
   enable-all: false
   disable-all: true

README.md

@@ -11,9 +11,7 @@ go get github.com/grishinsana/goftx
 > See examples directory and test cases for more examples
 
 ### TODO
-- Futures
 - Wallet
-- Converts
 - Funding Payments
 - Leveraged Tokens
 - Options
@@ -96,6 +94,14 @@ func main() {
 }
 ```
 
+### FTX US Mode
+If you need to use FTX US than you could set goftx.WithFTXUS option
+```go
+    client := goftx.New(
+		goftx.WithFTXUS(),
+	)
+```
+
 ### Websocket Debug Mode
 If need, it is possible to set debug mode to look error and system messages in stream methods
 ```go

account.go

@@ -25,7 +25,7 @@ func (a *Account) GetAccountInformation() (*models.AccountInformation, error) {
 	request, err := a.client.prepareRequest(Request{
 		Auth:   true,
 		Method: http.MethodGet,
-		URL:    fmt.Sprintf("%s%s", apiUrl, apiGetAccountInformation),
+		URL:    fmt.Sprintf("%s%s", a.client.apiURL, apiGetAccountInformation),
 	})
 	if err != nil {
 		return nil, errors.WithStack(err)
@@ -49,7 +49,7 @@ func (a *Account) GetPositions() ([]*models.Position, error) {
 	request, err := a.client.prepareRequest(Request{
 		Auth:   true,
 		Method: http.MethodGet,
-		URL:    fmt.Sprintf("%s%s", apiUrl, apiGetPositions),
+		URL:    fmt.Sprintf("%s%s", a.client.apiURL, apiGetPositions),
 	})
 	if err != nil {
 		return nil, errors.WithStack(err)
@@ -80,7 +80,7 @@ func (a *Account) ChangeAccountLeverage(leverage decimal.Decimal) error {
 	request, err := a.client.prepareRequest(Request{
 		Auth:   true,
 		Method: http.MethodPost,
-		URL:    fmt.Sprintf("%s%s", apiUrl, apiPostLeverage),
+		URL:    fmt.Sprintf("%s%s", a.client.apiURL, apiPostLeverage),
 		Body:   body,
 	})
 	if err != nil {

client.go

@@ -18,13 +18,13 @@ import (
 )
 
 const (
-	apiUrl    = "https://ftx.com/api"
-	apiOtcUrl = "https://otc.ftx.com/api"
+	apiUrlFormat = "https://ftx.%s/api"
+	apiOtcUrl    = "https://otc.ftx.com/api"
 
-	keyHeader        = "FTX-KEY"
-	signHeader       = "FTX-SIGN"
-	tsHeader         = "FTX-TS"
-	subAccountHeader = "FTX-SUBACCOUNT"
+	keyHeaderFormat        = "FTX%s-KEY"
+	signHeaderFormat       = "FTX%s-SIGN"
+	tsHeaderFormat         = "FTX%s-TS"
+	subAccountHeaderFormat = "FTX%s-SUBACCOUNT"
 )
 
 type Option func(c *Client)
@@ -35,6 +35,12 @@ func WithHTTPClient(client *http.Client) Option {
 	}
 }
 
+func WithFTXUS() Option {
+	return func(c *Client) {
+		c.isFtxUS = true
+	}
+}
+
 func WithAuth(key, secret string, subAccount ...string) Option {
 	return func(c *Client) {
 		c.apiKey = key
@@ -54,6 +60,8 @@ type Client struct {
 	secret         string
 	subAccount     string
 	serverTimeDiff time.Duration
+	isFtxUS        bool
+	apiURL         string
 	SubAccounts
 	Markets
 	Account
@@ -74,6 +82,12 @@ func New(opts ...Option) *Client {
 		opt(client)
 	}
 
+	domain := "com"
+	if client.isFtxUS {
+		domain = "us"
+	}
+	client.apiURL = fmt.Sprintf(apiUrlFormat, domain)
+
 	client.SubAccounts = SubAccounts{client: client}
 	client.Markets = Markets{client: client}
 	client.Account = Account{client: client}
@@ -87,7 +101,7 @@ func New(opts ...Option) *Client {
 		secret:                 client.secret,
 		subAccount:             client.subAccount,
 		mu:                     &sync.Mutex{},
-		url:                    wsUrl,
+		url:                    fmt.Sprintf(wsUrlFormat, domain),
 		dialer:                 websocket.DefaultDialer,
 		wsReconnectionCount:    reconnectCount,
 		wsReconnectionInterval: reconnectInterval,
@@ -144,13 +158,18 @@ func (c *Client) prepareRequest(request Request) (*http.Request, error) {
 			payload += string(request.Body)
 		}
 
+		usPrefix := ""
+		if c.isFtxUS {
+			usPrefix = "US"
+		}
+
 		req.Header.Set("Content-Type", "application/json")
-		req.Header.Set(keyHeader, c.apiKey)
-		req.Header.Set(signHeader, c.signture(payload))
-		req.Header.Set(tsHeader, nonce)
+		req.Header.Set(fmt.Sprintf(keyHeaderFormat, usPrefix), c.apiKey)
+		req.Header.Set(fmt.Sprintf(signHeaderFormat, usPrefix), c.signture(payload))
+		req.Header.Set(fmt.Sprintf(tsHeaderFormat, usPrefix), nonce)
 
 		if c.subAccount != "" {
-			req.Header.Set(subAccountHeader, c.subAccount)
+			req.Header.Set(fmt.Sprintf(subAccountHeaderFormat, usPrefix), c.subAccount)
 		}
 	}
 
@@ -221,7 +240,7 @@ func (c *Client) GetServerTime() (time.Time, error) {
 func (c Client) Ping() error {
 	request, err := c.prepareRequest(Request{
 		Method: http.MethodGet,
-		URL:    apiUrl,
+		URL:    c.apiURL,
 	})
 	if err != nil {
 		return errors.WithStack(err)

client_test.go

@@ -17,8 +17,15 @@ func TestClient_GetServerTime(t *testing.T) {
 }
 
 func TestClient_Ping(t *testing.T) {
-	ftx := New()
+	t.Run("com", func(t *testing.T) {
+		ftx := New(WithFTXUS())
+		err := ftx.Ping()
+		require.NoError(t, err)
+	})
 
-	err := ftx.Ping()
-	require.NoError(t, err)
+	t.Run("us", func(t *testing.T) {
+		ftx := New()
+		err := ftx.Ping()
+		require.NoError(t, err)
+	})
 }

converts.go

@@ -25,7 +25,7 @@ func (c *Converts) CreateQuote(payload *models.CreateQuotePayload) (int64, error
 	request, err := c.client.prepareRequest(Request{
 		Auth:   true,
 		Method: http.MethodPost,
-		URL:    fmt.Sprintf("%s%s", apiUrl, apiQuotes),
+		URL:    fmt.Sprintf("%s%s", c.client.apiURL, apiQuotes),
 		Body:   body,
 	})
 	if err != nil {
@@ -57,7 +57,7 @@ func (c *Converts) GetQuotes(quoteID int64, market *string) ([]*models.QuoteStat
 	request, err := c.client.prepareRequest(Request{
 		Auth:   true,
 		Method: http.MethodGet,
-		URL:    fmt.Sprintf("%s%s/%d", apiUrl, apiQuotes, quoteID),
+		URL:    fmt.Sprintf("%s%s/%d", c.client.apiURL, apiQuotes, quoteID),
 		Params: queryParams,
 	})
 	if err != nil {
@@ -82,7 +82,7 @@ func (c *Converts) AcceptQuote(quoteID int64) error {
 	request, err := c.client.prepareRequest(Request{
 		Auth:   true,
 		Method: http.MethodPost,
-		URL:    fmt.Sprintf("%s%s/%d/accept", apiUrl, apiQuotes, quoteID),
+		URL:    fmt.Sprintf("%s%s/%d/accept", c.client.apiURL, apiQuotes, quoteID),
 	})
 	if err != nil {
 		return errors.WithStack(err)

examples/websocket/main.go

@@ -19,6 +19,7 @@ func main() {
 
 	client := goftx.New(
 		goftx.WithAuth(os.Getenv("FTX_KEY"), os.Getenv("FTX_SECRET")),
+		goftx.WithFTXUS(),
 	)
 
 	client.Stream.SetStreamTimeout(60 * time.Second)

fills.go

@@ -25,7 +25,7 @@ func (f *Fills) GetFills(params *models.GetFillsParams) ([]*models.Fill, error)
 	request, err := f.client.prepareRequest(Request{
 		Auth:   true,
 		Method: http.MethodGet,
-		URL:    fmt.Sprintf("%s%s", apiUrl, apiFills),
+		URL:    fmt.Sprintf("%s%s", f.client.apiURL, apiFills),
 		Params: queryParams,
 	})
 	if err != nil {

futures.go

@@ -26,7 +26,7 @@ type Futures struct {
 func (f *Futures) GetFutures() ([]*models.Future, error) {
 	request, err := f.client.prepareRequest(Request{
 		Method: http.MethodGet,
-		URL:    fmt.Sprintf("%s%s", apiUrl, apiFutures),
+		URL:    fmt.Sprintf("%s%s", f.client.apiURL, apiFutures),
 	})
 	if err != nil {
 		return nil, errors.WithStack(err)
@@ -49,7 +49,7 @@ func (f *Futures) GetFutures() ([]*models.Future, error) {
 func (f *Futures) GetFuture(name string) (*models.Future, error) {
 	request, err := f.client.prepareRequest(Request{
 		Method: http.MethodGet,
-		URL:    fmt.Sprintf("%s%s/%s", apiUrl, apiFutures, name),
+		URL:    fmt.Sprintf("%s%s/%s", f.client.apiURL, apiFutures, name),
 	})
 	if err != nil {
 		return nil, errors.WithStack(err)
@@ -72,7 +72,7 @@ func (f *Futures) GetFuture(name string) (*models.Future, error) {
 func (f *Futures) GetFutureStats(name string) (*models.FutureStats, error) {
 	request, err := f.client.prepareRequest(Request{
 		Method: http.MethodGet,
-		URL:    fmt.Sprintf("%s%s/%s/stats", apiUrl, apiFutures, name),
+		URL:    fmt.Sprintf("%s%s/%s/stats", f.client.apiURL, apiFutures, name),
 	})
 	if err != nil {
 		return nil, errors.WithStack(err)
@@ -100,7 +100,7 @@ func (f *Futures) GetFundingRates(params *models.GetFundingRatesParams) ([]*mode
 
 	request, err := f.client.prepareRequest(Request{
 		Method: http.MethodGet,
-		URL:    fmt.Sprintf("%s%s", apiUrl, apiFundingRates),
+		URL:    fmt.Sprintf("%s%s", f.client.apiURL, apiFundingRates),
 		Params: queryParams,
 	})
 	if err != nil {
@@ -124,7 +124,7 @@ func (f *Futures) GetFundingRates(params *models.GetFundingRatesParams) ([]*mode
 func (f *Futures) GetIndexWeights(indexName string) (map[string]decimal.Decimal, error) {
 	request, err := f.client.prepareRequest(Request{
 		Method: http.MethodGet,
-		URL:    fmt.Sprintf("%s%s", apiUrl, fmt.Sprintf(apiIndexWeights, indexName)),
+		URL:    fmt.Sprintf("%s%s", f.client.apiURL, fmt.Sprintf(apiIndexWeights, indexName)),
 	})
 	if err != nil {
 		return nil, errors.WithStack(err)
@@ -147,7 +147,7 @@ func (f *Futures) GetIndexWeights(indexName string) (map[string]decimal.Decimal,
 func (f *Futures) GetExpiredFutures() ([]*models.FutureExpired, error) {
 	request, err := f.client.prepareRequest(Request{
 		Method: http.MethodGet,
-		URL:    fmt.Sprintf("%s%s", apiUrl, apiExpiredFutures),
+		URL:    fmt.Sprintf("%s%s", f.client.apiURL, apiExpiredFutures),
 	})
 	if err != nil {
 		return nil, errors.WithStack(err)
@@ -175,7 +175,7 @@ func (f *Futures) GetHistoricalIndex(market string, params *models.GetHistorical
 
 	request, err := f.client.prepareRequest(Request{
 		Method: http.MethodGet,
-		URL:    fmt.Sprintf("%s%s", apiUrl, fmt.Sprintf(apiIndexCandles, market)),
+		URL:    fmt.Sprintf("%s%s", f.client.apiURL, fmt.Sprintf(apiIndexCandles, market)),
 		Params: queryParams,
 	})
 	if err != nil {

markets.go

@@ -24,7 +24,7 @@ type Markets struct {
 func (m *Markets) GetMarkets() ([]*models.Market, error) {
 	request, err := m.client.prepareRequest(Request{
 		Method: http.MethodGet,
-		URL:    fmt.Sprintf("%s%s", apiUrl, apiGetMarkets),
+		URL:    fmt.Sprintf("%s%s", m.client.apiURL, apiGetMarkets),
 	})
 	if err != nil {
 		return nil, errors.WithStack(err)
@@ -47,7 +47,7 @@ func (m *Markets) GetMarkets() ([]*models.Market, error) {
 func (m *Markets) GetMarketByName(name string) (*models.Market, error) {
 	request, err := m.client.prepareRequest(Request{
 		Method: http.MethodGet,
-		URL:    fmt.Sprintf("%s%s/%s", apiUrl, apiGetMarkets, name),
+		URL:    fmt.Sprintf("%s%s/%s", m.client.apiURL, apiGetMarkets, name),
 	})
 	if err != nil {
 		return nil, errors.WithStack(err)
@@ -77,7 +77,7 @@ func (m *Markets) GetOrderBook(marketName string, depth *int) (*models.OrderBook
 
 	request, err := m.client.prepareRequest(Request{
 		Method: http.MethodGet,
-		URL:    fmt.Sprintf("%s%s", apiUrl, path),
+		URL:    fmt.Sprintf("%s%s", m.client.apiURL, path),
 		Params: params,
 	})
 	if err != nil {
@@ -107,7 +107,7 @@ func (m *Markets) GetTrades(marketName string, params *models.GetTradesParams) (
 	path := fmt.Sprintf(apiGetTrades, marketName)
 	request, err := m.client.prepareRequest(Request{
 		Method: http.MethodGet,
-		URL:    fmt.Sprintf("%s%s", apiUrl, path),
+		URL:    fmt.Sprintf("%s%s", m.client.apiURL, path),
 		Params: queryParams,
 	})
 	if err != nil {
@@ -137,7 +137,7 @@ func (m *Markets) GetHistoricalPrices(marketName string, params *models.GetHisto
 	path := fmt.Sprintf(apiGetHistoricalPrices, marketName)
 	request, err := m.client.prepareRequest(Request{
 		Method: http.MethodGet,
-		URL:    fmt.Sprintf("%s%s", apiUrl, path),
+		URL:    fmt.Sprintf("%s%s", m.client.apiURL, path),
 		Params: queryParams,
 	})
 	if err != nil {