mirror of
https://github.com/d0zingcat/gocryptotrader.git
synced 2026-06-03 15:10:49 +00:00
requester: defer execution of request.Item generation in closure (#723)
* requester: defer execution of request.Item generation in closure. * bithumb: fix issue * coinut/itbit: fix linter issues * binance: fix bug on recvWindow setting * requester: standardize sendpayload + add readme update * nonce: remove inc() function * request: defer unlockiflocked * binance: revert changes for open orders * btcmarkets: defer auth generation functionality, rm context deadline as this will be created just before sending HTTP request. * binance: move const to top * exmo: remove debug output as its generated in the requester function * ftx: defer auth functionality * requester: move error to top * bittrex: defer auth functionality * bitmex: defer auth functionality and remove deadline as generation occurs after rate limiting. * btse: defer auth functionality * coinbasepro: defer auth functionality and removed context deadline as this is generated after rate limiting * coinbene: defer auth functionality and remove context deadline as this is generated after rate limiting * huobi: defer auth functionality and remove context deadline as this is generated after rate limiting * huobi-futures: defer auth functionality and remove context deadline as this is generated after rate limiting * kraken: defer auth functionality and remove context deadline as this is generated after rate limiting * kraken: remove deadline protection for timestamp generation * okgroup: defer auth functionality and remove context deadline as this is generated after rate limiting * poloniex: defer auth functionality * zb: defer auth functionality and remove context deadline as this is generated after rate limiting * exchanges: clean up log output which are done and inspected in the requester package * binance: fix path bug on every retry, rm timeout context as this is not needed * coinbene: fix path bug on retry * binance: consolidate functionality * coinbene: fix linter issues * poloniex: linter fix * kraken: change add -> set * bitstamp: fix path bug for retry * BTSE: fix retry path bug * coinbene: fix path bug whoopsie by me * gateio: fix bug where on retry it does not reset reader * localbitcoins: fix path bug on retry * zb: change domain to land * exchanges: make sure io.Reader is generated every request * exchanges: move reader generation into function scope * wrapper_issues: setup exchange manager * engine: expand withdraw manager test * engine: dont look for environment * bitstamp: fix pathing bug (@thrasher-) * engine/withdraw_manager: purge tests as this is covered in repository withdraw
This commit is contained in:
Ryan O'Hara-Reid
GitHub
@@ -19,7 +19,6 @@ import (
|
||||
exchange "github.com/thrasher-corp/gocryptotrader/exchanges"
|
||||
"github.com/thrasher-corp/gocryptotrader/exchanges/asset"
|
||||
"github.com/thrasher-corp/gocryptotrader/exchanges/request"
|
||||
"github.com/thrasher-corp/gocryptotrader/log"
|
||||
)
|
||||
|
||||
// BTSE is the overarching type across this package
|
||||
@@ -438,14 +437,16 @@ func (b *BTSE) SendHTTPRequest(ep exchange.URL, method, endpoint string, result
|
||||
if !spotEndpoint {
|
||||
p = btseFuturesPath + btseFuturesAPIPath
|
||||
}
|
||||
return b.SendPayload(context.Background(), &request.Item{
|
||||
item := &request.Item{
|
||||
Method: method,
|
||||
Path: ePoint + p + endpoint,
|
||||
Result: result,
|
||||
Verbose: b.Verbose,
|
||||
HTTPDebugging: b.HTTPDebugging,
|
||||
HTTPRecording: b.HTTPRecording,
|
||||
Endpoint: f,
|
||||
}
|
||||
return b.SendPayload(context.Background(), f, func() (*request.Item, error) {
|
||||
return item, nil
|
||||
})
|
||||
}
|
||||
|
||||
@@ -460,66 +461,64 @@ func (b *BTSE) SendAuthenticatedHTTPRequest(ep exchange.URL, method, endpoint st
|
||||
return err
|
||||
}
|
||||
|
||||
// The concatenation is done this way because BTSE expect endpoint+nonce or endpoint+nonce+body
|
||||
// when signing the data but the full path of the request is /spot/api/v3.2/<endpoint>
|
||||
// its messy but it works and supports futures as well
|
||||
host := ePoint
|
||||
if isSpot {
|
||||
host += btseSPOTPath + btseSPOTAPIPath + endpoint
|
||||
endpoint = btseSPOTAPIPath + endpoint
|
||||
} else {
|
||||
host += btseFuturesPath + btseFuturesAPIPath
|
||||
endpoint += btseFuturesAPIPath
|
||||
}
|
||||
var hmac []byte
|
||||
var body io.Reader
|
||||
nonce := strconv.FormatInt(time.Now().UnixNano()/int64(time.Millisecond), 10)
|
||||
headers := map[string]string{
|
||||
"btse-api": b.API.Credentials.Key,
|
||||
"btse-nonce": nonce,
|
||||
}
|
||||
if req != nil {
|
||||
reqPayload, err := json.Marshal(req)
|
||||
if err != nil {
|
||||
return err
|
||||
newRequest := func() (*request.Item, error) {
|
||||
// The concatenation is done this way because BTSE expect endpoint+nonce or endpoint+nonce+body
|
||||
// when signing the data but the full path of the request is /spot/api/v3.2/<endpoint>
|
||||
// its messy but it works and supports futures as well
|
||||
host := ePoint
|
||||
var expandedEndpoint string
|
||||
if isSpot {
|
||||
host += btseSPOTPath + btseSPOTAPIPath + endpoint
|
||||
expandedEndpoint = btseSPOTAPIPath + endpoint
|
||||
} else {
|
||||
host += btseFuturesPath + btseFuturesAPIPath
|
||||
expandedEndpoint = endpoint + btseFuturesAPIPath
|
||||
}
|
||||
body = bytes.NewBuffer(reqPayload)
|
||||
hmac = crypto.GetHMAC(
|
||||
crypto.HashSHA512_384,
|
||||
[]byte((endpoint + nonce + string(reqPayload))),
|
||||
[]byte(b.API.Credentials.Secret),
|
||||
)
|
||||
headers["Content-Type"] = "application/json"
|
||||
} else {
|
||||
hmac = crypto.GetHMAC(
|
||||
crypto.HashSHA512_384,
|
||||
[]byte((endpoint + nonce)),
|
||||
[]byte(b.API.Credentials.Secret),
|
||||
)
|
||||
if len(values) > 0 {
|
||||
host += "?" + values.Encode()
|
||||
|
||||
var hmac []byte
|
||||
var body io.Reader
|
||||
nonce := strconv.FormatInt(time.Now().UnixNano()/int64(time.Millisecond), 10)
|
||||
headers := map[string]string{
|
||||
"btse-api": b.API.Credentials.Key,
|
||||
"btse-nonce": nonce,
|
||||
}
|
||||
}
|
||||
headers["btse-sign"] = crypto.HexEncodeToString(hmac)
|
||||
if req != nil {
|
||||
reqPayload, err := json.Marshal(req)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
body = bytes.NewBuffer(reqPayload)
|
||||
hmac = crypto.GetHMAC(
|
||||
crypto.HashSHA512_384,
|
||||
[]byte((expandedEndpoint + nonce + string(reqPayload))),
|
||||
[]byte(b.API.Credentials.Secret),
|
||||
)
|
||||
headers["Content-Type"] = "application/json"
|
||||
} else {
|
||||
hmac = crypto.GetHMAC(
|
||||
crypto.HashSHA512_384,
|
||||
[]byte((expandedEndpoint + nonce)),
|
||||
[]byte(b.API.Credentials.Secret),
|
||||
)
|
||||
if len(values) > 0 {
|
||||
host += "?" + values.Encode()
|
||||
}
|
||||
}
|
||||
headers["btse-sign"] = crypto.HexEncodeToString(hmac)
|
||||
|
||||
if b.Verbose {
|
||||
log.Debugf(log.ExchangeSys,
|
||||
"%s Sending %s request to URL %s",
|
||||
b.Name, method, endpoint)
|
||||
return &request.Item{
|
||||
Method: method,
|
||||
Path: host,
|
||||
Headers: headers,
|
||||
Body: body,
|
||||
Result: result,
|
||||
AuthRequest: true,
|
||||
Verbose: b.Verbose,
|
||||
HTTPDebugging: b.HTTPDebugging,
|
||||
HTTPRecording: b.HTTPRecording,
|
||||
}, nil
|
||||
}
|
||||
|
||||
return b.SendPayload(context.Background(), &request.Item{
|
||||
Method: method,
|
||||
Path: host,
|
||||
Headers: headers,
|
||||
Body: body,
|
||||
Result: result,
|
||||
AuthRequest: true,
|
||||
Verbose: b.Verbose,
|
||||
HTTPDebugging: b.HTTPDebugging,
|
||||
HTTPRecording: b.HTTPRecording,
|
||||
Endpoint: f,
|
||||
})
|
||||
return b.SendPayload(context.Background(), f, newRequest)
|
||||
}
|
||||
|
||||
// GetFee returns an estimate of fee based on type of transaction
|
||||
|
||||
Reference in New Issue
Block a user