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

fix: explicitly state that it is int64 #101

Merged
merged 1 commit into from
Mar 8, 2023
Merged

fix: explicitly state that it is int64 #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 16 additions & 16 deletions client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,31 +114,25 @@ func (c *Client) hasAuth() bool {
}

func (c *Client) populateSignature(src url.Values) url.Values {
intNow := int(time.Now().UTC().UnixNano() / int64(time.Millisecond))
now := strconv.Itoa(intNow)

if src == nil {
src = url.Values{}
}

src.Add("api_key", c.key)
src.Add("timestamp", now)
src.Add("timestamp", strconv.FormatInt(c.getTimestamp(), 10))
Comment on lines -117 to +122
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ref: https://github.com/bybit-exchange/api-usage-examples/blob/8d4a9fd28472eecefdaed19e8fa198eb2915ca58/V3_demo/api_demo/asset/Encryption_HMAC.go#L44-L48

src.Add("sign", getSignature(src, c.secret))

return src
}

func (c *Client) populateSignatureForBody(src []byte) []byte {
intNow := int(time.Now().UTC().UnixNano() / int64(time.Millisecond))
now := strconv.Itoa(intNow)

body := map[string]interface{}{}
if err := json.Unmarshal(src, &body); err != nil {
panic(err)
}

body["api_key"] = c.key
body["timestamp"] = now
body["timestamp"] = strconv.FormatInt(c.getTimestamp(), 10)
body["sign"] = getSignatureForBody(body, c.secret)

result, err := json.Marshal(body)
Expand All @@ -150,25 +144,25 @@ func (c *Client) populateSignatureForBody(src []byte) []byte {
}

func getV5Signature(
timestamp int,
timestamp int64,
key string,
queryString string,
secret string,
) string {
val := strconv.Itoa(timestamp) + key
val := strconv.FormatInt(timestamp, 10) + key
val = val + queryString
h := hmac.New(sha256.New, []byte(secret))
h.Write([]byte(val))
return hex.EncodeToString(h.Sum(nil))
}

func getV5SignatureForBody(
timestamp int,
timestamp int64,
key string,
body []byte,
secret string,
) string {
val := strconv.Itoa(timestamp) + key
val := strconv.FormatInt(timestamp, 10) + key
val = val + string(body)
h := hmac.New(sha256.New, []byte(secret))
h.Write([]byte(val))
Expand Down Expand Up @@ -276,15 +270,15 @@ func (c *Client) getV5Privately(path string, query url.Values, dst interface{})
u.Path = path
u.RawQuery = query.Encode()

timestamp := int(time.Now().UTC().UnixNano() / int64(time.Millisecond))
timestamp := c.getTimestamp()
sign := getV5Signature(timestamp, c.key, query.Encode(), c.secret)

req, err := http.NewRequest(http.MethodGet, u.String(), nil)
if err != nil {
return err
}
req.Header.Set("X-BAPI-API-KEY", c.key)
req.Header.Set("X-BAPI-TIMESTAMP", strconv.Itoa(timestamp))
req.Header.Set("X-BAPI-TIMESTAMP", strconv.FormatInt(timestamp, 10))
req.Header.Set("X-BAPI-SIGN", sign)

if err := c.Request(req, &dst); err != nil {
Expand Down Expand Up @@ -331,7 +325,7 @@ func (c *Client) postV5JSON(path string, body []byte, dst interface{}) error {
}
u.Path = path

timestamp := int(time.Now().UTC().UnixNano() / int64(time.Millisecond))
timestamp := c.getTimestamp()
sign := getV5SignatureForBody(timestamp, c.key, body, c.secret)

req, err := http.NewRequest(http.MethodPost, u.String(), bytes.NewBuffer(body))
Expand All @@ -340,7 +334,7 @@ func (c *Client) postV5JSON(path string, body []byte, dst interface{}) error {
}
req.Header.Set("Content-Type", "application/json")
req.Header.Set("X-BAPI-API-KEY", c.key)
req.Header.Set("X-BAPI-TIMESTAMP", strconv.Itoa(timestamp))
req.Header.Set("X-BAPI-TIMESTAMP", strconv.FormatInt(timestamp, 10))
req.Header.Set("X-BAPI-SIGN", sign)

if err := c.Request(req, &dst); err != nil {
Expand Down Expand Up @@ -403,3 +397,9 @@ func (c *Client) deletePrivately(path string, query url.Values, dst interface{})

return nil
}

func (c *Client) getTimestamp() int64 {
now := time.Now()
unixNano := now.UnixNano()
return unixNano / 1000000
}
6 changes: 3 additions & 3 deletions future_common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func (s *FutureCommonService) OrderBook(symbol SymbolFuture) (*OrderBookResponse
type ListKlineParam struct {
Symbol SymbolFuture `url:"symbol"`
Interval Interval `url:"interval"`
From int `url:"from"`
From int64 `url:"from"`

Limit *int `url:"limit,omitempty"`
}
Expand Down Expand Up @@ -335,7 +335,7 @@ type MarkPriceKlineResult struct {
type MarkPriceKlineParam struct {
Symbol SymbolFuture `url:"symbol"`
Interval Interval `url:"interval"`
From int `url:"from"`
From int64 `url:"from"`

Limit *int `url:"limit,omitempty"`
}
Expand Down Expand Up @@ -377,7 +377,7 @@ type IndexPriceKlineResult struct {
type IndexPriceKlineParam struct {
Symbol SymbolFuture `url:"symbol"`
Interval Interval `url:"interval"`
From int `url:"from"`
From int64 `url:"from"`

Limit *int `url:"limit,omitempty"`
}
Expand Down
2 changes: 1 addition & 1 deletion future_inverse_perpetual.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ type PremiumIndexKlineResult struct {
type PremiumIndexKlineParam struct {
Symbol SymbolFuture `url:"symbol"`
Interval Interval `url:"interval"`
From int `url:"from"`
From int64 `url:"from"`

Limit *int `url:"limit,omitempty"`
}
Expand Down
2 changes: 1 addition & 1 deletion future_usdt_perpetual.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ type FutureUSDTPerpetualService struct {
type ListLinearKlineParam struct {
Symbol SymbolFuture `url:"symbol"`
Interval Interval `url:"interval"`
From int `url:"from"`
From int64 `url:"from"`

Limit *int `url:"limit,omitempty"`
}
Expand Down
6 changes: 3 additions & 3 deletions integrationtest/future-inverse-future/future_inverse_future_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func TestListKline(t *testing.T) {
res, err := client.Future().InverseFuture().ListKline(bybit.ListKlineParam{
Symbol: bybit.SymbolFutureBTCUSD,
Interval: bybit.Interval120,
From: int(time.Now().AddDate(0, 0, -1).Unix()),
From: time.Now().AddDate(0, 0, -1).Unix(),
})
require.NoError(t, err)
{
Expand Down Expand Up @@ -117,7 +117,7 @@ func TestMarkPriceKline(t *testing.T) {
res, err := client.Future().InverseFuture().MarkPriceKline(bybit.MarkPriceKlineParam{
Symbol: bybit.SymbolFutureBTCUSD,
Interval: bybit.IntervalD,
From: int(time.Now().AddDate(0, 0, -1).Unix()),
From: time.Now().AddDate(0, 0, -1).Unix(),
})
require.NoError(t, err)
{
Expand All @@ -132,7 +132,7 @@ func TestIndexPriceKline(t *testing.T) {
res, err := client.Future().InverseFuture().IndexPriceKline(bybit.IndexPriceKlineParam{
Symbol: bybit.SymbolFutureBTCUSD,
Interval: bybit.IntervalD,
From: int(time.Now().AddDate(0, 0, -1).Unix()),
From: time.Now().AddDate(0, 0, -1).Unix(),
})
require.NoError(t, err)
{
Expand Down
8 changes: 4 additions & 4 deletions integrationtest/future-inverse-perpetual/future_inverse_perpetual_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func TestListKline(t *testing.T) {
res, err := client.Future().InversePerpetual().ListKline(bybit.ListKlineParam{
Symbol: bybit.SymbolFutureBTCUSD,
Interval: bybit.Interval120,
From: int(time.Now().AddDate(0, 0, -1).Unix()),
From: time.Now().AddDate(0, 0, -1).Unix(),
})
require.NoError(t, err)
{
Expand Down Expand Up @@ -117,7 +117,7 @@ func TestMarkPriceKline(t *testing.T) {
res, err := client.Future().InverseFuture().MarkPriceKline(bybit.MarkPriceKlineParam{
Symbol: bybit.SymbolFutureBTCUSD,
Interval: bybit.IntervalD,
From: int(time.Now().AddDate(0, 0, -1).Unix()),
From: time.Now().AddDate(0, 0, -1).Unix(),
})
require.NoError(t, err)
{
Expand All @@ -132,7 +132,7 @@ func TestIndexPriceKline(t *testing.T) {
res, err := client.Future().InversePerpetual().IndexPriceKline(bybit.IndexPriceKlineParam{
Symbol: bybit.SymbolFutureBTCUSD,
Interval: bybit.IntervalD,
From: int(time.Now().AddDate(0, 0, -1).Unix()),
From: time.Now().AddDate(0, 0, -1).Unix(),
})
require.NoError(t, err)
{
Expand Down Expand Up @@ -190,7 +190,7 @@ func TestPremiumIndexKline(t *testing.T) {
res, err := client.Future().InversePerpetual().PremiumIndexKline(bybit.PremiumIndexKlineParam{
Symbol: bybit.SymbolFutureBTCUSD,
Interval: bybit.Interval120,
From: int(time.Now().AddDate(0, 0, -1).Unix()),
From: time.Now().AddDate(0, 0, -1).Unix(),
})
require.NoError(t, err)
{
Expand Down
2 changes: 1 addition & 1 deletion integrationtest/future-usdt-perpetual/future_usdt_perpetual_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func TestListLinearKline(t *testing.T) {
res, err := client.Future().USDTPerpetual().ListLinearKline(bybit.ListLinearKlineParam{
Symbol: bybit.SymbolFutureBTCUSDT,
Interval: bybit.Interval120,
From: int(time.Now().AddDate(0, 0, -1).Unix()),
From: time.Now().AddDate(0, 0, -1).Unix(),
})
require.NoError(t, err)
{
Expand Down