adds the first couple of services for v2 REST endpoints

this also includes a breaking change because the REST endpoints use
nonces that are max 53bit, whereas before we used a 64bit number, so
if you've used this lib before you might have to generate a new API
key in order to get rid of the `nonce too small` error message

Author: knarz

examples/v2/rest-orders/main.go

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"log"
+	"os"
+
+	"github.com/bitfinexcom/bitfinex-api-go/v2"
+)
+
+// Set BFX_APIKEY and BFX_SECRET as :
+//
+// export BFX_API_KEY=YOUR_API_KEY
+// export BFX_API_SECRET=YOUR_API_SECRET
+//
+// you can obtain it from https://www.bitfinex.com/api
+
+func main() {
+	key := os.Getenv("BFX_API_KEY")
+	secret := os.Getenv("BFX_API_SECRET")
+	c := bitfinex.NewClient().Credentials(key, secret)
+
+	available, err := c.Platform.Status()
+	if err != nil {
+		log.Fatalf("getting status: %s", err)
+	}
+
+	if !available {
+		log.Fatalf("API not available")
+	}
+
+	os, err := c.Orders.History(bitfinex.TradingPrefix + bitfinex.IOTBTC)
+	if err != nil {
+		log.Fatalf("getting orders: %s", err)
+	}
+
+	log.Printf("orders: %#v\n", os)
+}

examples/v2/ws-private/main.go

@@ -26,11 +26,11 @@ func main() {
 		log.Fatalf("connecting authenticated websocket: %s", err)
 	}
 
-	c.Websocket.AttachEventHandler(func(_ context.Context, ev interface{}) {
+	c.Websocket.AttachEventHandler(func(ev interface{}) {
 		log.Printf("EVENT: %#v", ev)
 	})
 
-	c.Websocket.AttachPrivateHandler(func(_ context.Context, msg interface{}) {
+	c.Websocket.AttachPrivateHandler(func(msg interface{}) {
 		log.Printf("PRIV MSG: %#v", msg)
 	})
 

utils/nonce.go

@@ -9,7 +9,7 @@ import (
 var nonce uint64
 
 func init() {
-	nonce = uint64(time.Now().UnixNano())
+	nonce = uint64(time.Now().Unix()) * 1000
 }
 
 // GetNonce is a naive nonce producer that takes the current Unix nano epoch

v2/client.go

@@ -2,9 +2,9 @@
 package bitfinex
 
 import (
+	"bytes"
 	"crypto/hmac"
 	"crypto/sha512"
-	"encoding/base64"
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
@@ -18,7 +18,7 @@ import (
 
 const (
 	// BaseURL is the v2 REST endpoint.
-	BaseURL = "https://api.bitfinex.com/v2"
+	BaseURL = "https://api.bitfinex.com/v2/"
 
 	// WebSocketURL is the v2 Websocket endpoint.
 	WebSocketURL = "wss://api.bitfinex.com/ws/2"
@@ -38,6 +38,10 @@ type Client struct {
 
 	// Services
 	Websocket *bfxWebsocket
+	Orders    *OrderService
+	Platform  *PlatformService
+	Positions *PositionService
+	Trades    *TradeService
 }
 
 func NewClient() *Client {
@@ -50,12 +54,16 @@ func NewClientWithHTTP(h *http.Client) *Client {
 	c := &Client{BaseURL: baseURL, HTTPClient: h}
 
 	c.Websocket = newBfxWebsocket(c, WebSocketURL)
+	c.Orders = &OrderService{client: c}
+	c.Platform = &PlatformService{client: c}
+	c.Positions = &PositionService{client: c}
+	c.Trades = &TradeService{client: c}
 
 	return c
 }
 
 // NewRequest create new API request. Relative url can be provided in refURL.
-func (c *Client) newRequest(method string, refURL string, params url.Values) (*http.Request, error) {
+func (c *Client) newRequest(method string, refURL string, params url.Values, body io.Reader) (*http.Request, error) {
 	rel, err := url.Parse(refURL)
 	if err != nil {
 		return nil, err
@@ -65,7 +73,7 @@ func (c *Client) newRequest(method string, refURL string, params url.Values) (*h
 	}
 
 	u := c.BaseURL.ResolveReference(rel)
-	req, err := http.NewRequest(method, u.String(), nil)
+	req, err := http.NewRequest(method, u.String(), body)
 
 	if err != nil {
 		return nil, err
@@ -76,39 +84,39 @@ func (c *Client) newRequest(method string, refURL string, params url.Values) (*h
 
 // NewAuthenticatedRequest creates new http request for authenticated routes
 func (c *Client) newAuthenticatedRequest(m string, refURL string, data map[string]interface{}) (*http.Request, error) {
-	req, err := c.newRequest(m, refURL, nil)
-	if err != nil {
-		return nil, err
-	}
+	refURL = "auth/r/" + refURL
 
-	payload := map[string]interface{}{
-		"request": "/v2/" + refURL,
-		"nonce":   utils.GetNonce(),
+	if data == nil {
+		data = map[string]interface{}{}
 	}
 
-	for k, v := range data {
-		payload[k] = v
+	b, err := json.Marshal(data)
+	if err != nil {
+		return nil, err
 	}
 
-	payloadJSON, err := json.Marshal(payload)
+	rd := bytes.NewReader(b)
+	req, err := c.newRequest(m, refURL, nil, rd)
 	if err != nil {
 		return nil, err
 	}
 
-	payloadEnc := base64.StdEncoding.EncodeToString(payloadJSON)
+	nonce := utils.GetNonce()
+	message := "/api/v2/" + refURL + nonce + string(b)
+	sig := c.sign(message)
 
 	req.Header.Add("Content-Type", "application/json")
 	req.Header.Add("Accept", "application/json")
-	req.Header.Add("X-BFX-APIKEY", c.APIKey)
-	req.Header.Add("X-BFX-PAYLOAD", payloadEnc)
-	req.Header.Add("X-BFX-SIGNATURE", c.signPayload(payloadEnc))
+	req.Header.Add("bfx-nonce", nonce)
+	req.Header.Add("bfx-signature", sig)
+	req.Header.Add("bfx-apikey", c.APIKey)
 
 	return req, nil
 }
 
-func (c *Client) signPayload(payload string) string {
+func (c *Client) sign(msg string) string {
 	sig := hmac.New(sha512.New384, []byte(c.APISecret))
-	sig.Write([]byte(payload))
+	sig.Write([]byte(msg))
 	return hex.EncodeToString(sig.Sum(nil))
 }
 
@@ -158,14 +166,40 @@ func checkResponse(r *Response) error {
 		return nil
 	}
 
+	var raw []interface{}
 	// Try to decode error message
 	errorResponse := &ErrorResponse{Response: r}
-	err := json.Unmarshal(r.Body, errorResponse)
+	err := json.Unmarshal(r.Body, &raw)
 	if err != nil {
 		errorResponse.Message = "Error decoding response error message. " +
 			"Please see response body for more information."
+		return errorResponse
+	}
+
+	if len(raw) < 3 {
+		errorResponse.Message = fmt.Sprintf("Expected response to have three elements but got %#v", raw)
+		return errorResponse
 	}
 
+	if str, ok := raw[0].(string); !ok || str != "error" {
+		errorResponse.Message = fmt.Sprintf("Expected first element to be \"error\" but got %#v", raw)
+		return errorResponse
+	}
+
+	code, ok := raw[1].(float64)
+	if !ok {
+		errorResponse.Message = fmt.Sprintf("Expected second element to be error code but got %#v", raw)
+		return errorResponse
+	}
+	errorResponse.Code = int(code)
+
+	msg, ok := raw[2].(string)
+	if !ok {
+		errorResponse.Message = fmt.Sprintf("Expected third element to be error message but got %#v", raw)
+		return errorResponse
+	}
+	errorResponse.Message = msg
+
 	return errorResponse
 }
 
@@ -174,14 +208,16 @@ func checkResponse(r *Response) error {
 type ErrorResponse struct {
 	Response *Response
 	Message  string `json:"message"`
+	Code     int    `json:"code"`
 }
 
 func (r *ErrorResponse) Error() string {
-	return fmt.Sprintf("%v %v: %d %v",
+	return fmt.Sprintf("%v %v: %d %v (%d)",
 		r.Response.Response.Request.Method,
 		r.Response.Response.Request.URL,
 		r.Response.Response.StatusCode,
 		r.Message,
+		r.Code,
 	)
 }
 
@@ -194,7 +230,6 @@ func (c *Client) do(req *http.Request, v interface{}) (*Response, error) {
 	defer resp.Body.Close()
 
 	response := newResponse(resp)
-
 	err = checkResponse(response)
 	if err != nil {
 		return response, err

v2/errors.go

@@ -0,0 +1,9 @@
+package bitfinex
+
+import (
+	"errors"
+)
+
+var (
+	ErrNotFound = errors.New("not found")
+)

v2/orders.go

@@ -0,0 +1,78 @@
+package bitfinex
+
+import (
+	"fmt"
+	"path"
+)
+
+// OrderService manages the Order endpoint.
+type OrderService struct {
+	client *Client
+}
+
+// All returns all orders for the authenticated account.
+func (s *OrderService) All(symbol string) (OrderSnapshot, error) {
+	req, err := s.client.newAuthenticatedRequest("POST", path.Join("orders", symbol), nil)
+	if err != nil {
+		return nil, err
+	}
+
+	var raw []interface{}
+	_, err = s.client.do(req, &raw)
+	if err != nil {
+		return nil, err
+	}
+
+	os, err := orderSnapshotFromRaw(raw)
+	if err != nil {
+		return nil, err
+	}
+
+	return os, nil
+}
+
+// Status retrieves the given order from the API. This is just a wrapper around
+// the All() method, since the API does not provide lookup for a single Order.
+func (s *OrderService) Status(orderID int64) (o Order, err error) {
+	os, err := s.All("")
+	if err != nil {
+		return o, err
+	}
+	if len(os) == 0 {
+		return o, ErrNotFound
+	}
+
+	for _, e := range os {
+		if e.ID == orderID {
+			return e, nil
+		}
+	}
+
+	return o, ErrNotFound
+}
+
+// All returns all orders for the authenticated account.
+func (s *OrderService) History(symbol string) (OrderSnapshot, error) {
+	if symbol == "" {
+		return nil, fmt.Errorf("symbol cannot be empty")
+	}
+
+	req, err := s.client.newAuthenticatedRequest("POST", path.Join("orders", symbol, "hist"), nil)
+	if err != nil {
+		return nil, err
+	}
+
+	var raw []interface{}
+	_, err = s.client.do(req, &raw)
+	if err != nil {
+		return nil, err
+	}
+	fmt.Printf("raw: %#v\n", raw)
+
+	os, err := orderSnapshotFromRaw(raw)
+	if err != nil {
+		return nil, err
+	}
+
+	return os, nil
+}

v2/orders_test.go

@@ -0,0 +1,65 @@
+package bitfinex
+
+import (
+	"bytes"
+	"io/ioutil"
+	"net/http"
+	"testing"
+)
+
+func TestOrdersAll(t *testing.T) {
+	httpDo = func(_ *http.Client, req *http.Request) (*http.Response, error) {
+		msg := `
+				[
+					[4419360502,null,83283216761,"tIOTBTC",1508281683000,1508281731000,63938,63938,"EXCHANGE LIMIT",null,null,null,null,"CANCELED",null,null,0.0000843,0,0,0,null,null,null,0,0,null],
+					[4419354239,null,83265164211,"tIOTBTC",1508281665000,1508281674000,63976,63976,"EXCHANGE LIMIT",null,null,null,null,"CANCELED",null,null,0.00008425,0,0,0,null,null,null,0,0,null],
+					[4419339620,null,83217673277,"tIOTBTC",1508281618000,1508281653000,64014,64014,"EXCHANGE LIMIT",null,null,null,null,"CANCELED",null,null,0.0000842,0,0,0,null,null,null,0,0,null]
+				]`
+		resp := http.Response{
+			Body:       ioutil.NopCloser(bytes.NewBufferString(msg)),
+			StatusCode: 200,
+		}
+		return &resp, nil
+	}
+
+	orders, err := NewClient().Orders.All("")
+
+	if err != nil {
+		t.Error(err)
+	}
+
+	if len(orders) != 3 {
+		t.Fatalf("expected three orders but got %d", len(orders))
+	}
+}
+
+func TestOrdersHistory(t *testing.T) {
+	httpDo = func(_ *http.Client, req *http.Request) (*http.Response, error) {
+		msg := `
+				[
+					[4419360502,null,83283216761,"tIOTBTC",1508281683000,1508281731000,63938,63938,"EXCHANGE LIMIT",null,null,null,null,"CANCELED",null,null,0.0000843,0,0,0,null,null,null,0,0,null],
+					[4419354239,null,83265164211,"tIOTBTC",1508281665000,1508281674000,63976,63976,"EXCHANGE LIMIT",null,null,null,null,"CANCELED",null,null,0.00008425,0,0,0,null,null,null,0,0,null],
+					[4419339620,null,83217673277,"tIOTBTC",1508281618000,1508281653000,64014,64014,"EXCHANGE LIMIT",null,null,null,null,"CANCELED",null,null,0.0000842,0,0,0,null,null,null,0,0,null]
+				]`
+		resp := http.Response{
+			Body:       ioutil.NopCloser(bytes.NewBufferString(msg)),
+			StatusCode: 200,
+		}
+		return &resp, nil
+	}
+
+	orders, err := NewClient().Orders.History(TradingPrefix + IOTBTC)
+
+	if err != nil {
+		t.Error(err)
+	}
+
+	if len(orders) != 3 {
+		t.Errorf("expected three orders but got %d", len(orders))
+	}
+
+	_, err = NewClient().Orders.History("")
+	if err == nil {
+		t.Errorf("expected error when supplying empty symbol but got none")
+	}
+}