Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bid / Ask are Mixed in Marshalling #34

Closed
wants to merge 2 commits into from
Closed

Bid / Ask are Mixed in Marshalling #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ceac22a
changed bid / ask spread
Oct 8, 2021
a3dd01a
changes for retry;
Oct 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions rest/const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,3 +122,10 @@ const (
OrderModeIOC = "IOC"
OrderModeGTD = "GTD"
)

// Default Retry Count
const (
MaxRequestRetryCount = 3
RetryDelayMs = 50
InitialRetryCount = 1
)
30 changes: 28 additions & 2 deletions rest/kraken.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,41 @@ func (api *Kraken) parseResponse(response *http.Response, retType interface{}) e
return nil
}

func (api *Kraken) request(method string, isPrivate bool, data url.Values, retType interface{}) error {
/*
request 1 => err
request 2 => err
request 3 =>


*/
func (api *Kraken) request(method string, isPrivate bool, data url.Values, retType interface{}, retryCount int) error {
req, err := api.prepareRequest(method, isPrivate, data)
if err != nil {
return err
}

resp, err := api.client.Do(req)
if err != nil {

if retryCount <= MaxRequestRetryCount {
fmt.Printf("Retrying request %d of %d\n", retryCount, MaxRequestRetryCount)
retryCount += 1
time.Sleep(RetryDelayMs * time.Millisecond)
return api.request(method, isPrivate, data, retType, retryCount)
}
return errors.Wrap(err, "error during request execution")
}
defer resp.Body.Close()
return api.parseResponse(resp, retType)
err = api.parseResponse(resp, retType)
if err != nil {
if retryCount <= MaxRequestRetryCount {
fmt.Printf("Retrying request %d of %d\n", retryCount, MaxRequestRetryCount)
retryCount += 1
time.Sleep(RetryDelayMs * time.Millisecond)
return api.request(method, isPrivate, data, retType, retryCount)
}
return err
}

return nil
}
6 changes: 5 additions & 1 deletion rest/kraken_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,11 +365,15 @@ func TestKraken_request(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
api := New(tt.fields.key, tt.fields.secret)
err := api.request(tt.args.method, tt.args.isPrivate, tt.args.data, tt.args.retType)
err := api.request(tt.args.method, tt.args.isPrivate, tt.args.data, tt.args.retType, MaxRequestRetryCount)
if (err != nil) != tt.wantErr {
t.Errorf("Kraken.request() error = %v, wantErr %v", err, tt.wantErr)
return
}
})
}
}

func TestKraken_requestRetry(t *testing.T) {

}
16 changes: 8 additions & 8 deletions rest/methods.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
// Time - Gets server time. Note: This is to aid in approximating the skew time between the server and client.
func (api *Kraken) Time() (TimeResponse, error) {
response := TimeResponse{}
if err := api.request("Time", false, nil, &response); err != nil {
if err := api.request("Time", false, nil, &response, InitialRetryCount); err != nil {
return response, err
}
return response, nil
Expand All @@ -26,7 +26,7 @@ func (api *Kraken) Assets(assets ...string) (map[string]Asset, error) {
data = nil
}
response := make(map[string]Asset)
if err := api.request("Assets", false, data, &response); err != nil {
if err := api.request("Assets", false, data, &response, InitialRetryCount); err != nil {
return response, err
}
return response, nil
Expand All @@ -42,7 +42,7 @@ func (api *Kraken) AssetPairs(pairs ...string) (map[string]AssetPair, error) {
data = nil
}
response := make(map[string]AssetPair)
if err := api.request("AssetPairs", false, data, &response); err != nil {
if err := api.request("AssetPairs", false, data, &response, InitialRetryCount); err != nil {
return nil, err
}
return response, nil
Expand All @@ -60,7 +60,7 @@ func (api *Kraken) Ticker(pairs ...string) (map[string]Ticker, error) {
return nil, errors.New("you need to set pairs on Ticker request")
}
response := make(map[string]Ticker)
if err := api.request("Ticker", false, data, &response); err != nil {
if err := api.request("Ticker", false, data, &response, InitialRetryCount); err != nil {
return nil, err
}
return response, nil
Expand All @@ -78,7 +78,7 @@ func (api *Kraken) Candles(pair string, interval int64, since int64) (OHLCRespon
data.Set("interval", strconv.FormatInt(interval, 10))
}
response := OHLCResponse{}
if err := api.request("OHLC", false, data, &response); err != nil {
if err := api.request("OHLC", false, data, &response, InitialRetryCount); err != nil {
return response, err
}
return response, nil
Expand All @@ -91,7 +91,7 @@ func (api *Kraken) GetOrderBook(pair string, depth int64) (map[string]OrderBook,
"count": {strconv.FormatInt(depth, 10)},
}
response := make(map[string]OrderBook)
if err := api.request("Depth", false, data, &response); err != nil {
if err := api.request("Depth", false, data, &response, InitialRetryCount); err != nil {
return nil, err
}
return response, nil
Expand All @@ -106,7 +106,7 @@ func (api *Kraken) GetTrades(pair string, since int64) (TradeResponse, error) {
data.Add("since", strconv.FormatInt(since, 10))
}
response := TradeResponse{}
if err := api.request("Trades", false, data, &response); err != nil {
if err := api.request("Trades", false, data, &response, InitialRetryCount); err != nil {
return response, err
}
return response, nil
Expand All @@ -121,7 +121,7 @@ func (api *Kraken) GetSpread(pair string, since int64) (SpreadResponse, error) {
data.Add("since", strconv.FormatInt(since, 10))
}
response := SpreadResponse{}
if err := api.request("Spread", false, data, &response); err != nil {
if err := api.request("Spread", false, data, &response, InitialRetryCount); err != nil {
return response, err
}
return response, nil
Expand Down
32 changes: 16 additions & 16 deletions rest/private_methods.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
// GetAccountBalances - methods returns account balances
func (api *Kraken) GetAccountBalances() (map[string]decimal.Decimal, error) {
response := make(map[string]decimal.Decimal)
if err := api.request("Balance", true, nil, &response); err != nil {
if err := api.request("Balance", true, nil, &response, InitialRetryCount); err != nil {
return response, err
}
return response, nil
Expand All @@ -27,7 +27,7 @@ func (api *Kraken) GetTradeBalance(baseAsset string) (TradeBalanceResponse, erro
}

response := TradeBalanceResponse{}
if err := api.request("TradeBalance", true, data, &response); err != nil {
if err := api.request("TradeBalance", true, data, &response, InitialRetryCount); err != nil {
return response, err
}
return response, nil
Expand All @@ -44,7 +44,7 @@ func (api *Kraken) GetOpenOrders(needTrades bool, userRef string) (OpenOrdersRes
}

response := OpenOrdersResponse{}
if err := api.request("OpenOrders", true, data, &response); err != nil {
if err := api.request("OpenOrders", true, data, &response, InitialRetryCount); err != nil {
return response, err
}
return response, nil
Expand All @@ -67,7 +67,7 @@ func (api *Kraken) GetClosedOrders(needTrades bool, userRef string, start int64,
}

response := ClosedOrdersResponse{}
if err := api.request("ClosedOrders", true, data, &response); err != nil {
if err := api.request("ClosedOrders", true, data, &response, InitialRetryCount); err != nil {
return response, err
}
return response, nil
Expand All @@ -93,7 +93,7 @@ func (api *Kraken) QueryOrders(needTrades bool, userRef string, txIDs ...string)
}

response := make(map[string]OrderInfo)
if err := api.request("QueryOrders", true, data, &response); err != nil {
if err := api.request("QueryOrders", true, data, &response, InitialRetryCount); err != nil {
return nil, err
}
return response, nil
Expand All @@ -117,7 +117,7 @@ func (api *Kraken) GetTradesHistory(tradeType string, needTrades bool, start int
data.Set("end", strconv.FormatInt(end, 10))
}
response := TradesHistoryResponse{}
if err := api.request("TradesHistory", true, data, &response); err != nil {
if err := api.request("TradesHistory", true, data, &response, InitialRetryCount); err != nil {
return response, err
}
return response, nil
Expand All @@ -134,7 +134,7 @@ func (api *Kraken) GetDepositMethods(assets ...string) ([]DepositMethods, error)
}

response := make([]DepositMethods, 0)
if err := api.request("DepositMethods", true, data, &response); err != nil {
if err := api.request("DepositMethods", true, data, &response, InitialRetryCount); err != nil {
return response, err
}
return response, nil
Expand All @@ -152,7 +152,7 @@ func (api *Kraken) GetDepositStatus(method string, assets ...string) ([]DepositS
data.Add("method", method)
}
response := make([]DepositStatuses, 0)
if err := api.request("DepositStatus", true, data, &response); err != nil {
if err := api.request("DepositStatus", true, data, &response, InitialRetryCount); err != nil {
return response, err
}
return response, nil
Expand All @@ -170,7 +170,7 @@ func (api *Kraken) QueryTrades(trades bool, txIDs ...string) (map[string]Private
data.Set("txid", strings.Join(txIDs, ","))

response := make(map[string]PrivateTrade)
if err := api.request("QueryTrades", true, data, &response); err != nil {
if err := api.request("QueryTrades", true, data, &response, InitialRetryCount); err != nil {
return nil, err
}
return response, nil
Expand All @@ -188,7 +188,7 @@ func (api *Kraken) GetOpenPositions(docalcs bool, txIDs ...string) (map[string]P
data.Set("txid", strings.Join(txIDs, ","))

response := make(map[string]Position)
if err := api.request("OpenPositions", true, data, &response); err != nil {
if err := api.request("OpenPositions", true, data, &response, InitialRetryCount); err != nil {
return nil, err
}
return response, nil
Expand All @@ -211,7 +211,7 @@ func (api *Kraken) GetLedgersInfo(ledgerType string, start int64, end int64, ass
data.Set("assets", strings.Join(assets, ","))
}

if err := api.request("Ledgers", true, data, &response); err != nil {
if err := api.request("Ledgers", true, data, &response, InitialRetryCount); err != nil {
return response, err
}
return response, nil
Expand All @@ -229,7 +229,7 @@ func (api *Kraken) QueryLedgers(ledgerIds ...string) (map[string]Ledger, error)
data.Set("id", strings.Join(ledgerIds, ","))

response := make(map[string]Ledger)
if err := api.request("QueryLedgers", true, data, &response); err != nil {
if err := api.request("QueryLedgers", true, data, &response, InitialRetryCount); err != nil {
return nil, err
}
return response, nil
Expand All @@ -247,7 +247,7 @@ func (api *Kraken) GetTradeVolume(needFeeInfo bool, pairs ...string) (TradeVolum
}
data.Set("pair", strings.Join(pairs, ","))

if err := api.request("TradeVolume", true, data, &response); err != nil {
if err := api.request("TradeVolume", true, data, &response, InitialRetryCount); err != nil {
return response, err
}
return response, nil
Expand Down Expand Up @@ -276,7 +276,7 @@ func (api *Kraken) AddOrder(pair string, side string, orderType string, volume f
}
}

err = api.request("AddOrder", true, data, &response)
err = api.request("AddOrder", true, data, &response, InitialRetryCount)
return
}

Expand All @@ -285,12 +285,12 @@ func (api *Kraken) Cancel(orderID string) (response CancelResponse, err error) {
data := url.Values{
"txid": {orderID},
}
err = api.request("CancelOrder", true, data, &response)
err = api.request("CancelOrder", true, data, &response, InitialRetryCount)
return
}

// GetWebSocketsToken - WebSockets authentication
func (api *Kraken) GetWebSocketsToken() (response GetWebSocketTokenResponse, err error) {
err = api.request("GetWebSocketsToken", true, nil, &response)
err = api.request("GetWebSocketsToken", true, nil, &response, InitialRetryCount)
return
}
2 changes: 1 addition & 1 deletion websocket/data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ type Spread struct {

// UnmarshalJSON - unmarshal candle update
func (s *Spread) UnmarshalJSON(data []byte) error {
raw := []interface{}{&s.Ask, &s.Bid, &s.Time, &s.AskVolume, &s.BidVolume, &s.Time}
raw := []interface{}{&s.Bid, &s.Ask, &s.Time, &s.BidVolume, &s.AskVolume}
return json.Unmarshal(data, &raw)
}

Expand Down
11 changes: 11 additions & 0 deletions websocket/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package websocket

import (
"encoding/json"
"fmt"
"time"

log "github.com/sirupsen/logrus"
)
Expand All @@ -28,6 +30,15 @@ func (k *Kraken) handleEvent(msg []byte) error {
case EventCancelAllOrdersAfter:
return k.handleEventCancellAllOrdersAfter(msg)
case EventHeartbeat:
currentTime := time.Now().Unix()
if currentTime%30 == 0 {
wsType := "public"
if k.token != "" {
wsType = "private"
}
log.Info(fmt.Sprintf("Kraken %s heartbeat received.", wsType))
}

default:
log.Warnf("unknown event: %s", msg)
}
Expand Down
2 changes: 1 addition & 1 deletion websocket/kraken.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ func (k *Kraken) handleMessage(data []byte) error {
case '{':
return k.handleEvent(data)
default:
return errors.Errorf("Unexpected message: %s", string(data))
return errors.Errorf("(Kraken) Unexpected message: %s", string(data))
}
}

Expand Down