mirror of
https://github.com/d0zingcat/gocryptotrader.git
synced 2026-06-04 23:16:54 +00:00
Feature: Implement funding rates, futures and coin margin (exchange API coverage) (#530)
* ALMOST THERE * more api wips * more api thingz * testing n more api wipz * more apiz * more wips * what is goin on * more wips * whip n testing * testing * testing no keys * remove log * kraken is broken ugh * still broken * fixing auth funcs + usdtm api docs * wip * api stuffs * whip * more wips * whip * more wip * api wip n testing * wip * wip * unsaved * wip n testing * wip * wip * wip * wip * wip * wip * wip * wip * wip * whip * wrapper authenticated functions * adding asset type and fixing dependencies * wip * binance auth wrapper start * wrapper functionality * wip * wip * wip * wrapper cancel functions * order submission for wrappers * wip * more error fixing and nits * websocket beginning n error fix * wip * WOW * glorious n shazzy nits * useless nits * wip * fixing things * merge stuffs * crapveyor * crapveyor rebuild * probably broke more things than he fixed * rm lns n other thangs * hope * please * stop it * done * ofcourse * rm vb * fix lbank * appveyor please * float lev * DONT ASK RYAN FOR HELP EVER * wip * wip * endpoint upgrades continued * path upgrade * NeeeNeeeNeeeNeeeNING * fix stuffs * fixing time issue * fixing broken funcs * glorious nits * shaz changes * fixing errors for fundmon * more error fixing for fundmon * test running past 30s * basic changes * THX AGAIN SHAZBERT * path system upgrade * config upgrade * unsaved stuffs * broken wip config upgrade * path system upgrade contd. * path system upgrade contd * path upgrade ready for review * testing verbose removed * linter stuffs * appveyor stuffs * appveyor stuff * fixed? * bugfix * wip * broken stuff * fix test * wierd hack fix * appveyor pls stop * error found * more useless nits * bitmex err * broken wip * broken wip path upgrade change to uint32 * changed url lookups to uint * WOW * ready4review * config fixed HOPEFULLY * config fix and glorious changes * efficient way of getting orders and open orders * binance wrapper logic fixing * testing, adding tests and fixing lot of errrrrs * merge master * appveyor stuffs * appveyor stuffs * fmt * test * octalLiteral issue fix? * octalLiteral fix? * rm vb * prnt ln to restart * adding testz * test fixzzz * READY FOR REVIEW * Actually ready now * FORMATTING * addressing shazzy n glorious nits * crapveyor * rm vb * small change * fixing err * shazbert nits * review changes * requested changes * more requested changes * noo * last nit fixes * restart appveyor * improving test cov * Update .golangci.yml * shazbert changes * moving pair formatting * format pair update wip * path upgrade complete * error fix * appveyor linters * more linters * remove testexch * more formatting changes * changes * shazbert changes * checking older requested changes to ensure completion * wip * fixing broken code * error fix * all fixed * additional changes * more changes * remove commented code * ftx margin api * appveyor fixes * more appveyor issues + test addition * more appveyor issues + test addition * remove unnecessary * testing * testing, fixing okex api, error fix * git merge fix * go sum * glorious changes and error fix * rm vb * more glorious changes and go mod tidy * fixed now * okex testing upgrade * old config migration and batch fetching fix * added test * glorious requested changes WIP * tested and fixed * go fmted * go fmt and test fix * additional funcs and tests for fundingRates * OKEX tested and fixed * appveyor fixes * ineff assign * 1 glorious change * error fix * typo * shazbert changes * glorious code changes and path fixing huobi WIP * adding assetType to accountinfo functions * fixing panic * panic fix and updating account info wrappers WIP * updateaccountinfo updated * testing WIP binance USDT n Coin Margined and Kraken Futures * auth functions tested and fixed * added test * config reverted * shazbert and glorious changes * shazbert and glorious changes * latest changes and portfolio update * go fmt change: * remove commented codes * improved error checking * index out of range fix * rm ln * critical nit * glorious latest changes * appveyor changes * shazbert change * easier readability * latest glorious changes * shadow dec * assetstore updated * last change * another last change * merge changes * go mod tidy * thrasher requested changes wip * improving struct layouts * appveyor go fmt * remove unnecessary code * shazbert changes * small change * oopsie * tidy * configtest reverted * error fix * oopsie * for what * test patch fix * insecurities * fixing tests * fix config
This commit is contained in:
@@ -58,10 +58,10 @@ func (h *HitBTC) GetCurrencies() (map[string]Currencies, error) {
|
||||
Data []Currencies
|
||||
}
|
||||
resp := Response{}
|
||||
path := fmt.Sprintf("%s/%s", h.API.Endpoints.URL, apiV2Currency)
|
||||
path := fmt.Sprintf("/%s", apiV2Currency)
|
||||
|
||||
ret := make(map[string]Currencies)
|
||||
err := h.SendHTTPRequest(path, &resp.Data)
|
||||
err := h.SendHTTPRequest(exchange.RestSpot, path, &resp.Data)
|
||||
if err != nil {
|
||||
return ret, err
|
||||
}
|
||||
@@ -79,9 +79,9 @@ func (h *HitBTC) GetCurrency(currency string) (Currencies, error) {
|
||||
Data Currencies
|
||||
}
|
||||
resp := Response{}
|
||||
path := fmt.Sprintf("%s/%s/%s", h.API.Endpoints.URL, apiV2Currency, currency)
|
||||
path := fmt.Sprintf("/%s/%s", apiV2Currency, currency)
|
||||
|
||||
return resp.Data, h.SendHTTPRequest(path, &resp.Data)
|
||||
return resp.Data, h.SendHTTPRequest(exchange.RestSpot, path, &resp.Data)
|
||||
}
|
||||
|
||||
// GetSymbols Return the actual list of currency symbols (currency pairs) traded
|
||||
@@ -91,10 +91,10 @@ func (h *HitBTC) GetCurrency(currency string) (Currencies, error) {
|
||||
// of the base currency.
|
||||
func (h *HitBTC) GetSymbols(symbol string) ([]string, error) {
|
||||
var resp []Symbol
|
||||
path := fmt.Sprintf("%s/%s/%s", h.API.Endpoints.URL, apiV2Symbol, symbol)
|
||||
path := fmt.Sprintf("/%s/%s", apiV2Symbol, symbol)
|
||||
|
||||
ret := make([]string, 0, len(resp))
|
||||
err := h.SendHTTPRequest(path, &resp)
|
||||
err := h.SendHTTPRequest(exchange.RestSpot, path, &resp)
|
||||
if err != nil {
|
||||
return ret, err
|
||||
}
|
||||
@@ -109,22 +109,22 @@ func (h *HitBTC) GetSymbols(symbol string) ([]string, error) {
|
||||
// all their details.
|
||||
func (h *HitBTC) GetSymbolsDetailed() ([]Symbol, error) {
|
||||
var resp []Symbol
|
||||
path := fmt.Sprintf("%s/%s", h.API.Endpoints.URL, apiV2Symbol)
|
||||
return resp, h.SendHTTPRequest(path, &resp)
|
||||
path := fmt.Sprintf("/%s", apiV2Symbol)
|
||||
return resp, h.SendHTTPRequest(exchange.RestSpot, path, &resp)
|
||||
}
|
||||
|
||||
// GetTicker returns ticker information
|
||||
func (h *HitBTC) GetTicker(symbol string) (TickerResponse, error) {
|
||||
var resp TickerResponse
|
||||
path := fmt.Sprintf("%s/%s/%s", h.API.Endpoints.URL, apiV2Ticker, symbol)
|
||||
return resp, h.SendHTTPRequest(path, &resp)
|
||||
path := fmt.Sprintf("/%s/%s", apiV2Ticker, symbol)
|
||||
return resp, h.SendHTTPRequest(exchange.RestSpot, path, &resp)
|
||||
}
|
||||
|
||||
// GetTickers returns ticker information
|
||||
func (h *HitBTC) GetTickers() ([]TickerResponse, error) {
|
||||
var resp []TickerResponse
|
||||
path := fmt.Sprintf("%s/%s/", h.API.Endpoints.URL, apiV2Ticker)
|
||||
return resp, h.SendHTTPRequest(path, &resp)
|
||||
path := fmt.Sprintf("/%s/", apiV2Ticker)
|
||||
return resp, h.SendHTTPRequest(exchange.RestSpot, path, &resp)
|
||||
}
|
||||
|
||||
// GetTrades returns trades from hitbtc
|
||||
@@ -150,12 +150,11 @@ func (h *HitBTC) GetTrades(currencyPair, by, sort string, from, till, limit, off
|
||||
}
|
||||
|
||||
var resp []TradeHistory
|
||||
path := fmt.Sprintf("%s/%s/%s?%s",
|
||||
h.API.Endpoints.URL,
|
||||
path := fmt.Sprintf("/%s/%s?%s",
|
||||
apiV2Trades,
|
||||
currencyPair,
|
||||
urlValues.Encode())
|
||||
return resp, h.SendHTTPRequest(path, &resp)
|
||||
return resp, h.SendHTTPRequest(exchange.RestSpot, path, &resp)
|
||||
}
|
||||
|
||||
// GetOrderbook an order book is an electronic list of buy and sell orders for a
|
||||
@@ -169,13 +168,12 @@ func (h *HitBTC) GetOrderbook(currencyPair string, limit int) (Orderbook, error)
|
||||
}
|
||||
|
||||
resp := OrderbookResponse{}
|
||||
path := fmt.Sprintf("%s/%s/%s?%s",
|
||||
h.API.Endpoints.URL,
|
||||
path := fmt.Sprintf("/%s/%s?%s",
|
||||
apiV2Orderbook,
|
||||
currencyPair,
|
||||
vals.Encode())
|
||||
|
||||
err := h.SendHTTPRequest(path, &resp)
|
||||
err := h.SendHTTPRequest(exchange.RestSpot, path, &resp)
|
||||
if err != nil {
|
||||
return Orderbook{}, err
|
||||
}
|
||||
@@ -213,8 +211,8 @@ func (h *HitBTC) GetCandles(currencyPair, limit, period string, start, end time.
|
||||
}
|
||||
|
||||
var resp []ChartData
|
||||
path := fmt.Sprintf("%s/%s/%s?%s", h.API.Endpoints.URL, apiV2Candles, currencyPair, vals.Encode())
|
||||
return resp, h.SendHTTPRequest(path, &resp)
|
||||
path := fmt.Sprintf("/%s/%s?%s", apiV2Candles, currencyPair, vals.Encode())
|
||||
return resp, h.SendHTTPRequest(exchange.RestSpot, path, &resp)
|
||||
}
|
||||
|
||||
// Authenticated Market Data
|
||||
@@ -223,7 +221,7 @@ func (h *HitBTC) GetCandles(currencyPair, limit, period string, start, end time.
|
||||
// GetBalances returns full balance for your account
|
||||
func (h *HitBTC) GetBalances() (map[string]Balance, error) {
|
||||
var result []Balance
|
||||
err := h.SendAuthenticatedHTTPRequest(http.MethodGet,
|
||||
err := h.SendAuthenticatedHTTPRequest(exchange.RestSpot, http.MethodGet,
|
||||
apiV2Balance,
|
||||
url.Values{},
|
||||
otherRequests,
|
||||
@@ -246,7 +244,7 @@ func (h *HitBTC) GetDepositAddresses(currency string) (DepositCryptoAddresses, e
|
||||
var resp DepositCryptoAddresses
|
||||
|
||||
return resp,
|
||||
h.SendAuthenticatedHTTPRequest(http.MethodGet,
|
||||
h.SendAuthenticatedHTTPRequest(exchange.RestSpot, http.MethodGet,
|
||||
apiV2CryptoAddress+"/"+currency,
|
||||
url.Values{},
|
||||
otherRequests,
|
||||
@@ -256,7 +254,7 @@ func (h *HitBTC) GetDepositAddresses(currency string) (DepositCryptoAddresses, e
|
||||
// GenerateNewAddress generates a new deposit address for a currency
|
||||
func (h *HitBTC) GenerateNewAddress(currency string) (DepositCryptoAddresses, error) {
|
||||
resp := DepositCryptoAddresses{}
|
||||
err := h.SendAuthenticatedHTTPRequest(http.MethodPost,
|
||||
err := h.SendAuthenticatedHTTPRequest(exchange.RestSpot, http.MethodPost,
|
||||
apiV2CryptoAddress+"/"+currency,
|
||||
url.Values{},
|
||||
otherRequests,
|
||||
@@ -268,7 +266,7 @@ func (h *HitBTC) GenerateNewAddress(currency string) (DepositCryptoAddresses, er
|
||||
// GetActiveorders returns all your active orders
|
||||
func (h *HitBTC) GetActiveorders(currency string) ([]Order, error) {
|
||||
var resp []Order
|
||||
err := h.SendAuthenticatedHTTPRequest(http.MethodGet,
|
||||
err := h.SendAuthenticatedHTTPRequest(exchange.RestSpot, http.MethodGet,
|
||||
orders+"?symbol="+currency,
|
||||
url.Values{},
|
||||
tradingRequests,
|
||||
@@ -292,7 +290,7 @@ func (h *HitBTC) GetTradeHistoryForCurrency(currency, start, end string) (Authen
|
||||
values.Set("currencyPair", currency)
|
||||
result := AuthenticatedTradeHistoryResponse{}
|
||||
|
||||
return result, h.SendAuthenticatedHTTPRequest(http.MethodPost,
|
||||
return result, h.SendAuthenticatedHTTPRequest(exchange.RestSpot, http.MethodPost,
|
||||
apiV2TradeHistory,
|
||||
values,
|
||||
otherRequests,
|
||||
@@ -314,7 +312,7 @@ func (h *HitBTC) GetTradeHistoryForAllCurrencies(start, end string) (Authenticat
|
||||
values.Set("currencyPair", "all")
|
||||
result := AuthenticatedTradeHistoryAll{}
|
||||
|
||||
return result, h.SendAuthenticatedHTTPRequest(http.MethodPost,
|
||||
return result, h.SendAuthenticatedHTTPRequest(exchange.RestSpot, http.MethodPost,
|
||||
apiV2TradeHistory,
|
||||
values,
|
||||
otherRequests,
|
||||
@@ -327,7 +325,7 @@ func (h *HitBTC) GetOrders(currency string) ([]OrderHistoryResponse, error) {
|
||||
values.Set("symbol", currency)
|
||||
var result []OrderHistoryResponse
|
||||
|
||||
return result, h.SendAuthenticatedHTTPRequest(http.MethodGet,
|
||||
return result, h.SendAuthenticatedHTTPRequest(exchange.RestSpot, http.MethodGet,
|
||||
apiV2OrderHistory,
|
||||
values,
|
||||
tradingRequests,
|
||||
@@ -340,7 +338,7 @@ func (h *HitBTC) GetOpenOrders(currency string) ([]OrderHistoryResponse, error)
|
||||
values.Set("symbol", currency)
|
||||
var result []OrderHistoryResponse
|
||||
|
||||
return result, h.SendAuthenticatedHTTPRequest(http.MethodGet,
|
||||
return result, h.SendAuthenticatedHTTPRequest(exchange.RestSpot, http.MethodGet,
|
||||
apiv2OpenOrders,
|
||||
values,
|
||||
tradingRequests,
|
||||
@@ -359,7 +357,7 @@ func (h *HitBTC) PlaceOrder(currency string, rate, amount float64, orderType, si
|
||||
values.Set("price", strconv.FormatFloat(rate, 'f', -1, 64))
|
||||
values.Set("type", orderType)
|
||||
|
||||
return result, h.SendAuthenticatedHTTPRequest(http.MethodPost,
|
||||
return result, h.SendAuthenticatedHTTPRequest(exchange.RestSpot, http.MethodPost,
|
||||
apiOrder,
|
||||
values,
|
||||
tradingRequests,
|
||||
@@ -371,7 +369,7 @@ func (h *HitBTC) CancelExistingOrder(orderID int64) (bool, error) {
|
||||
result := GenericResponse{}
|
||||
values := url.Values{}
|
||||
|
||||
err := h.SendAuthenticatedHTTPRequest(http.MethodDelete,
|
||||
err := h.SendAuthenticatedHTTPRequest(exchange.RestSpot, http.MethodDelete,
|
||||
apiOrder+"/"+strconv.FormatInt(orderID, 10),
|
||||
values,
|
||||
tradingRequests,
|
||||
@@ -392,7 +390,7 @@ func (h *HitBTC) CancelExistingOrder(orderID int64) (bool, error) {
|
||||
func (h *HitBTC) CancelAllExistingOrders() ([]Order, error) {
|
||||
var result []Order
|
||||
values := url.Values{}
|
||||
return result, h.SendAuthenticatedHTTPRequest(http.MethodDelete,
|
||||
return result, h.SendAuthenticatedHTTPRequest(exchange.RestSpot, http.MethodDelete,
|
||||
apiOrder,
|
||||
values,
|
||||
tradingRequests,
|
||||
@@ -410,7 +408,7 @@ func (h *HitBTC) MoveOrder(orderID int64, rate, amount float64) (MoveOrderRespon
|
||||
values.Set("amount", strconv.FormatFloat(amount, 'f', -1, 64))
|
||||
}
|
||||
|
||||
err := h.SendAuthenticatedHTTPRequest(http.MethodPost,
|
||||
err := h.SendAuthenticatedHTTPRequest(exchange.RestSpot, http.MethodPost,
|
||||
orderMove,
|
||||
values,
|
||||
tradingRequests,
|
||||
@@ -436,7 +434,7 @@ func (h *HitBTC) Withdraw(currency, address string, amount float64) (bool, error
|
||||
values.Set("amount", strconv.FormatFloat(amount, 'f', -1, 64))
|
||||
values.Set("address", address)
|
||||
|
||||
err := h.SendAuthenticatedHTTPRequest(http.MethodPost,
|
||||
err := h.SendAuthenticatedHTTPRequest(exchange.RestSpot, http.MethodPost,
|
||||
apiV2CryptoWithdraw,
|
||||
values,
|
||||
otherRequests,
|
||||
@@ -456,7 +454,7 @@ func (h *HitBTC) Withdraw(currency, address string, amount float64) (bool, error
|
||||
// GetFeeInfo returns current fee information
|
||||
func (h *HitBTC) GetFeeInfo(currencyPair string) (Fee, error) {
|
||||
result := Fee{}
|
||||
err := h.SendAuthenticatedHTTPRequest(http.MethodGet,
|
||||
err := h.SendAuthenticatedHTTPRequest(exchange.RestSpot, http.MethodGet,
|
||||
apiV2FeeInfo+"/"+currencyPair,
|
||||
url.Values{},
|
||||
tradingRequests,
|
||||
@@ -472,7 +470,7 @@ func (h *HitBTC) GetTradableBalances() (map[string]map[string]float64, error) {
|
||||
}
|
||||
result := Response{}
|
||||
|
||||
err := h.SendAuthenticatedHTTPRequest(http.MethodPost,
|
||||
err := h.SendAuthenticatedHTTPRequest(exchange.RestSpot, http.MethodPost,
|
||||
tradableBalances,
|
||||
url.Values{},
|
||||
tradingRequests,
|
||||
@@ -504,7 +502,7 @@ func (h *HitBTC) TransferBalance(currency, from, to string, amount float64) (boo
|
||||
values.Set("fromAccount", from)
|
||||
values.Set("toAccount", to)
|
||||
|
||||
err := h.SendAuthenticatedHTTPRequest(http.MethodPost,
|
||||
err := h.SendAuthenticatedHTTPRequest(exchange.RestSpot, http.MethodPost,
|
||||
transferBalance,
|
||||
values,
|
||||
otherRequests,
|
||||
@@ -522,10 +520,14 @@ func (h *HitBTC) TransferBalance(currency, from, to string, amount float64) (boo
|
||||
}
|
||||
|
||||
// SendHTTPRequest sends an unauthenticated HTTP request
|
||||
func (h *HitBTC) SendHTTPRequest(path string, result interface{}) error {
|
||||
func (h *HitBTC) SendHTTPRequest(ep exchange.URL, path string, result interface{}) error {
|
||||
endpoint, err := h.API.Endpoints.GetURL(ep)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return h.SendPayload(context.Background(), &request.Item{
|
||||
Method: http.MethodGet,
|
||||
Path: path,
|
||||
Path: endpoint + path,
|
||||
Result: result,
|
||||
Verbose: h.Verbose,
|
||||
HTTPDebugging: h.HTTPDebugging,
|
||||
@@ -535,15 +537,19 @@ func (h *HitBTC) SendHTTPRequest(path string, result interface{}) error {
|
||||
}
|
||||
|
||||
// SendAuthenticatedHTTPRequest sends an authenticated http request
|
||||
func (h *HitBTC) SendAuthenticatedHTTPRequest(method, endpoint string, values url.Values, f request.EndpointLimit, result interface{}) error {
|
||||
func (h *HitBTC) SendAuthenticatedHTTPRequest(ep exchange.URL, method, endpoint string, values url.Values, f request.EndpointLimit, result interface{}) error {
|
||||
if !h.AllowAuthenticatedRequest() {
|
||||
return fmt.Errorf(exchange.WarningAuthenticatedRequestWithoutCredentialsSet,
|
||||
h.Name)
|
||||
}
|
||||
ePoint, err := h.API.Endpoints.GetURL(ep)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
headers := make(map[string]string)
|
||||
headers["Authorization"] = "Basic " + crypto.Base64Encode([]byte(h.API.Credentials.Key+":"+h.API.Credentials.Secret))
|
||||
|
||||
path := fmt.Sprintf("%s/%s", h.API.Endpoints.URL, endpoint)
|
||||
path := fmt.Sprintf("%s/%s", ePoint, endpoint)
|
||||
|
||||
return h.SendPayload(context.Background(), &request.Item{
|
||||
Method: method,
|
||||
|
||||
@@ -265,8 +265,9 @@ func TestFormatWithdrawPermissions(t *testing.T) {
|
||||
|
||||
func TestGetActiveOrders(t *testing.T) {
|
||||
var getOrdersRequest = order.GetOrdersRequest{
|
||||
Type: order.AnyType,
|
||||
Pairs: []currency.Pair{currency.NewPair(currency.ETH, currency.BTC)},
|
||||
Type: order.AnyType,
|
||||
Pairs: []currency.Pair{currency.NewPair(currency.ETH, currency.BTC)},
|
||||
AssetType: asset.Spot,
|
||||
}
|
||||
|
||||
_, err := h.GetActiveOrders(&getOrdersRequest)
|
||||
@@ -279,8 +280,9 @@ func TestGetActiveOrders(t *testing.T) {
|
||||
|
||||
func TestGetOrderHistory(t *testing.T) {
|
||||
var getOrdersRequest = order.GetOrdersRequest{
|
||||
Type: order.AnyType,
|
||||
Pairs: []currency.Pair{currency.NewPair(currency.ETH, currency.BTC)},
|
||||
Type: order.AnyType,
|
||||
AssetType: asset.Spot,
|
||||
Pairs: []currency.Pair{currency.NewPair(currency.ETH, currency.BTC)},
|
||||
}
|
||||
|
||||
_, err := h.GetOrderHistory(&getOrdersRequest)
|
||||
|
||||
@@ -130,10 +130,14 @@ func (h *HitBTC) SetDefaults() {
|
||||
h.Requester = request.New(h.Name,
|
||||
common.NewHTTPClientWithTimeout(exchange.DefaultHTTPTimeout),
|
||||
request.WithLimiter(SetRateLimit()))
|
||||
|
||||
h.API.Endpoints.URLDefault = apiURL
|
||||
h.API.Endpoints.URL = h.API.Endpoints.URLDefault
|
||||
h.API.Endpoints.WebsocketURL = hitbtcWebsocketAddress
|
||||
h.API.Endpoints = h.NewEndpoints()
|
||||
err = h.API.Endpoints.SetDefaultEndpoints(map[exchange.URL]string{
|
||||
exchange.RestSpot: apiURL,
|
||||
exchange.WebsocketSpot: hitbtcWebsocketAddress,
|
||||
})
|
||||
if err != nil {
|
||||
log.Errorln(log.ExchangeSys, err)
|
||||
}
|
||||
h.Websocket = stream.New()
|
||||
h.WebsocketResponseMaxLimit = exchange.DefaultWebsocketResponseMaxLimit
|
||||
h.WebsocketResponseCheckTimeout = exchange.DefaultWebsocketResponseCheckTimeout
|
||||
@@ -152,6 +156,11 @@ func (h *HitBTC) Setup(exch *config.ExchangeConfig) error {
|
||||
return err
|
||||
}
|
||||
|
||||
wsRunningURL, err := h.API.Endpoints.GetURL(exchange.WebsocketSpot)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = h.Websocket.Setup(&stream.WebsocketSetup{
|
||||
Enabled: exch.Features.Enabled.Websocket,
|
||||
Verbose: exch.Verbose,
|
||||
@@ -159,7 +168,7 @@ func (h *HitBTC) Setup(exch *config.ExchangeConfig) error {
|
||||
WebsocketTimeout: exch.WebsocketTrafficTimeout,
|
||||
DefaultURL: hitbtcWebsocketAddress,
|
||||
ExchangeName: exch.Name,
|
||||
RunningURL: exch.API.Endpoints.WebsocketURL,
|
||||
RunningURL: wsRunningURL,
|
||||
Connector: h.WsConnect,
|
||||
Subscriber: h.Subscribe,
|
||||
UnSubscriber: h.Unsubscribe,
|
||||
@@ -404,7 +413,7 @@ func (h *HitBTC) UpdateOrderbook(c currency.Pair, assetType asset.Item) (*orderb
|
||||
|
||||
// UpdateAccountInfo retrieves balances for all enabled currencies for the
|
||||
// HitBTC exchange
|
||||
func (h *HitBTC) UpdateAccountInfo() (account.Holdings, error) {
|
||||
func (h *HitBTC) UpdateAccountInfo(assetType asset.Item) (account.Holdings, error) {
|
||||
var response account.Holdings
|
||||
response.Exchange = h.Name
|
||||
accountBalance, err := h.GetBalances()
|
||||
@@ -434,10 +443,10 @@ func (h *HitBTC) UpdateAccountInfo() (account.Holdings, error) {
|
||||
}
|
||||
|
||||
// FetchAccountInfo retrieves balances for all enabled currencies
|
||||
func (h *HitBTC) FetchAccountInfo() (account.Holdings, error) {
|
||||
acc, err := account.GetHoldings(h.Name)
|
||||
func (h *HitBTC) FetchAccountInfo(assetType asset.Item) (account.Holdings, error) {
|
||||
acc, err := account.GetHoldings(h.Name, assetType)
|
||||
if err != nil {
|
||||
return h.UpdateAccountInfo()
|
||||
return h.UpdateAccountInfo(assetType)
|
||||
}
|
||||
|
||||
return acc, nil
|
||||
@@ -772,8 +781,8 @@ func (h *HitBTC) AuthenticateWebsocket() error {
|
||||
|
||||
// ValidateCredentials validates current credentials used for wrapper
|
||||
// functionality
|
||||
func (h *HitBTC) ValidateCredentials() error {
|
||||
_, err := h.UpdateAccountInfo()
|
||||
func (h *HitBTC) ValidateCredentials(assetType asset.Item) error {
|
||||
_, err := h.UpdateAccountInfo(assetType)
|
||||
return h.CheckTransientError(err)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user