Add nonce support

Author: bolaum

biscoint_api_python/__init__.py

@@ -4,6 +4,7 @@
 import json
 from urllib.parse import urljoin
 import requests
+import time
 
 
 class Biscoint:
@@ -128,7 +129,7 @@ def get_balance(self, **kwargs):
                         "BTC": "0.01138164"
                     }
         """
-        return self._call('balance', addAuth=True)
+        return self._call('balance', add_auth=True, method='post')
 
     def get_trades(self, op: str = None, length: int = None):
         """Gets last `length` trades. Current API default is 10.
@@ -157,7 +158,7 @@ def get_trades(self, op: str = None, length: int = None):
         return self._call('trades', {
             'op': op,
             'length': length,
-        }, addAuth=True)
+        }, add_auth=True, method='post')
 
     def get_offer(
         self,
@@ -201,7 +202,7 @@ def get_offer(
             'isQuote': isQuote,
             'base': base,
             'quote': quote,
-        }, addAuth=True)
+        }, add_auth=True, method='post')
 
     def confirm_offer(self, offer_id: str):
         """Confirms offer and execute operation.
@@ -226,36 +227,51 @@ def confirm_offer(self, offer_id: str):
                         "apiKeyId": "BdFABxNakZyxPwnRu"
                     }
         """
-        return self._call('offer', {
+        return self._call('offer/confirm', {
             'offerId': offer_id,
-        }, addAuth=True, method='post')
+        }, add_auth=True, method='post')
 
     # PRIVATE
 
-    def _call(self, endpoint: str, params: dict = {}, method: str = 'get', addAuth: bool = False):
-        headers = None
+    def _call(self, endpoint: str, params: dict = {}, method: str = 'get', add_auth: bool = False):
+        headers = {
+            'Content-Type': 'application/json',
+        }
+        data = None
+        nonce = 0
 
         v1_endpoint = 'v1/%s' % (endpoint)
         url = urljoin(self.api_url, v1_endpoint)
-        params['request'] = v1_endpoint
+        reqParams = self._remove_null_params(params)
+
+        # print(reqParams)
+
+        if method == 'get':
+            data = None
+            reqParams = self._normalize_params(reqParams)
 
-        params = self._remove_null_params(params)
+        if method == 'post':
+            data = json.dumps(
+                reqParams,
+                sort_keys=True,
+                separators=(',', ':'),
+            )
+            reqParams = None
 
-        # print(params)
+            if add_auth:
+                nonce = int(time.time() * 1000000)
+                signedParams = self._sign(endpoint, nonce, data)
+                headers['BSCNT-NONCE'] = str(nonce)
+                headers['BSCNT-APIKEY'] = self.api_key
+                headers['BSCNT-SIGN'] = signedParams
 
-        if addAuth:
-            signedParams = self._sign(params)
-            headers = {
-                'BSCNT-APIKEY': self.api_key,
-                'BSCNT-SIGN': signedParams,
-            }
-            # print(headers)
+        # print(headers)
 
         res = requests.request(
             method=method,
             url=url,
-            params=self._normalize_params(params) if method == 'get' else None,
-            data=self._normalize_params(params) if method == 'post' else None,
+            params=reqParams,
+            data=data,
             headers=headers,
         )
 
@@ -267,21 +283,17 @@ def _call(self, endpoint: str, params: dict = {}, method: str = 'get', addAuth:
 
         return res_json['data']
 
-    def _sign(self, params: dict):
-        jsonString = json.dumps(
-            params,
-            sort_keys=True,
-            separators=(',', ':'),
-        ).encode('utf-8')
-        hashBuffer = base64.b64encode(jsonString)
+    def _sign(self, endpoint: str, nonce: int, data: str):
+        strToBeSigned = ('v1/%s%d%s' % (endpoint, nonce, data)).encode('utf-8')
+        hashBuffer = base64.b64encode(strToBeSigned)
 
-        # print(jsonString)
+        # print(strToBeSigned)
         # print(hashBuffer)
 
         sign_data = hmac.new(
             self.api_secret.encode(),
             hashBuffer,
-            hashlib.sha256
+            hashlib.sha384
         ).hexdigest()
 
         # print(sign_data)

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="biscoint-api-python",
-    version="0.5.1",
+    version="0.6.0",
     author="Thiago Borges Abdnur",
     author_email="bolaum@gmail.com",
     description="Biscoint API wrapper for python",
@@ -20,7 +20,7 @@
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
-        "Development Status :: 3 - Alpha",
+        "Development Status :: 4 - Beta",
         "Intended Audience :: Developers",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Topic :: Office/Business :: Financial :: Investment",