increased compatibility and additional endpoint functionality

danpaquin · danpaquin · commit 8c80973f09ce · 2016-11-17T21:15:10.000-05:00
diff --git a/GDAX/AuthenticatedClient.py b/GDAX/AuthenticatedClient.py
@@ -4,13 +4,16 @@
 #
 # For authenticated requests to the GDAX exchange
 
-import hmac, hashlib, time, requests, base64
+import hmac, hashlib, time, requests, base64, json
 from requests.auth import AuthBase
 from GDAX.PublicClient import PublicClient
 
 class AuthenticatedClient(PublicClient):
     def __init__(self, key, b64secret, passphrase, api_url="https://api.gdax.com", product_id="BTC-USD"):
-        self.url = api_url
+        if api_url[-1] == "/":
+            self.url = api_url[:-1]
+        else:
+            self.url = api_url
         self.productId = product_id
         self.auth = GdaxAuth(key, b64secret, passphrase)
 
@@ -57,12 +60,12 @@ def buy(self, buyParams):
         buyParams["side"] = "buy"
         if not buyParams["product_id"]:
             buyParams["product_id"] = self.productId
-        r = requests.post(self.url + '/orders', json=buyParams, auth=self.auth)
+        r = requests.post(self.url + '/orders', data=json.dumps(buyParams), auth=self.auth)
         return r.json()
 
     def sell(self, sellParams):
         sellParams["side"] = "sell"
-        r = requests.post(self.url + '/orders', json=sellParams, auth=self.auth)
+        r = requests.post(self.url + '/orders', data=json.dumps(sellParams), auth=self.auth)
         return r.json()
 
     def cancelOrder(self, orderId):
@@ -120,7 +123,7 @@ def deposit(self, amount="", accountId=""):
             "amount": amount,
             "accountId": accountId
         }
-        r = requests.post(self.url + "/transfers", json=payload, auth=self.auth)
+        r = requests.post(self.url + "/transfers", data=json.dumps(payload), auth=self.auth)
         return r.json()
 
     def withdraw(self, amount="", accountId=""):
@@ -129,7 +132,36 @@ def withdraw(self, amount="", accountId=""):
             "amount": amount,
             "accountId": accountId
         }
-        r = requests.post(self.url + "/transfers", json=payload, auth=self.auth)
+        r = requests.post(self.url + "/transfers", data=json.dumps(payload), auth=self.auth)
+        return r.json()
+
+    def getPaymentMethods(self):
+        r = requests.get(self.url + "/payment-methods", auth=self.auth)
+        return r.json()
+
+    def getCoinbaseAccounts(self):
+        r = requests.get(self.url + "/coinbase-accounts", auth=self.auth)
+        return r.json()
+
+    def createReport(self, type="", start_date="", end_date="", product_id="", account_id="", format="", email=""):
+        payload = {
+            "type": type,
+            "start_date": start_date,
+            "end_date": end_date,
+            "product_id": product_id,
+            "account_id": account_id,
+            "format": format,
+            "email": email
+        }
+        r = requests.post(self.url + "/reports", data=json.dumps(payload), auth=self.auth)
+        return r.json()
+
+    def getReport(self, reportId=""):
+        r = requests.get(self.url + "/reports/" + reportId, auth=self.auth)
+        return r.json()
+
+    def getTrailingVolume(self):
+        r = requests.get(self.url + "/users/self/trailing-volume", auth=self.auth)
         return r.json()
 
 class GdaxAuth(AuthBase):
@@ -147,9 +179,10 @@ def __call__(self, request):
         signature = hmac.new(hmac_key, message, hashlib.sha256)
         signature_b64 = base64.b64encode(signature.digest())
         request.headers.update({
+            'Content-Type': 'Application/JSON',
             'CB-ACCESS-SIGN': signature_b64,
             'CB-ACCESS-TIMESTAMP': timestamp,
             'CB-ACCESS-KEY': self.api_key,
-            'CB-ACCESS-PASSPHRASE': self.passphrase,
+            'CB-ACCESS-PASSPHRASE': self.passphrase
         })
         return request
diff --git a/GDAX/PublicClient.py b/GDAX/PublicClient.py
@@ -8,7 +8,10 @@
 
 class PublicClient():
     def __init__(self, api_url="https://api.gdax.com", product_id="BTC-USD"):
-        self.url = api_url
+        if api_url[-1] == "/":
+            self.url = api_url[:-1]
+        else:
+            self.url = api_url
         self.productId = product_id
 
     def getProducts(self):
diff --git a/GDAX/WebsocketClient.py b/GDAX/WebsocketClient.py
@@ -4,15 +4,17 @@
 #
 # Template object to receive messages from the GDAX Websocket Feed
 
-import json
+import json, time
 from   threading import Thread
-import time
 from   websocket import create_connection
 
 class WebsocketClient():
-    def __init__(self, ws_url="wss://ws-feed.gdax.com", product_id="BTC-USD"):
+    def __init__(self, ws_url="wss://ws-feed-public.sandbox.gdax.com", product_id="BTC-USD"):
+        if ws_url[-1] == "/":
+            self.url = ws_url[:-1]
+        else:
+            self.url = ws_url
         self.stop = False
-        self.url = ws_url
         self.product_id = product_id
         self.thread = Thread(target=self.setup)
         self.thread.start()
diff --git a/README.md b/README.md
@@ -11,12 +11,22 @@ A Python client for the [GDAX API](https://docs.gdax.com/) (formerly known as th
 - Do not worry about handling the nuances of the API with easy-to-use methods for every API endpoint.
 - Have an advantage in the market by getting under the hood of GDAX to learn what and who is *really* behind every tick.
 
+
 ## Under Development
-- Bug Fixing **please report**
+- Test Scripts **looking for help**
+- Additional Functionality for *AuthenticatedClient.py* (including support for all order types)
 - FIX API Client **researching**
 
+## Change Log
+*0.1.2*
+- Updated JSON handling for increased compatibility among some users
+- Added support for payment methods, reports, and coinbase user accounts
+- Other compatibility updates
+*0.1.1b2 **Current PyPI release***
+- Original PyPI Release
+
 ## Getting Started
-This README is only to inform you on the intricacies of the python wrapper presented in this repository.  In order to use it to its full potential, you must familiarize yourself with the official documentation.
+This README is only to inform you on the intricacies of the python wrapper presented in this repository.  **In order to use this wrapper to its full potential, you must familiarize yourself with the official documentation.**
 
 - https://docs.gdax.com/
 
