Merge branch 'master' of github.com:ccxt/ccxt

ccxt · May 30, 2018 · 292ca03 · 292ca03
2 parents 30caf06 + 37a396e
commit 292ca03
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 13 deletions.
diff --git a/build/ccxt.browser.js b/build/ccxt.browser.js
diff --git a/ccxt.js b/ccxt.js
@@ -37,7 +37,7 @@ const Exchange  = require ('./js/base/Exchange')
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
 
-const version = '1.14.92'
+const version = '1.14.93'
 
 Exchange.ccxtVersion = version
 

diff --git a/keys.json b/keys.json
@@ -39,6 +39,7 @@
     "coinsecure":    { "apiKey": "QUw1StRQpIpcN2PdWEdEHTS8zVDjF98kcQ5LoGIj" },
     "coinspot":      { "apiKey": "f212d2519be1814dce6eb9cfe7f60f7b", "secret": "R5H5DBEL482WC14EAJTDBVLJDDUFL28HV43D5PNM4QEAYR69WW56QKQ1ECG7XYLEB85FBKAFQ68UYWQXJ", "skip": true },
     "coolcoin":      { "skip": true },
+    "cryptopia":     { "skip": true },
     "dsx":           { "skip": true, "apiKey": "13bbd413-2d97-4373-8757-72f35b8803cc", "secret": "9X6QHG9Q2U5876D1RNSFJJ02E8P2KGTORSPSC2AMN7YJ" },
     "exx":           { "skip": true },
     "flowbtc":       { "skip": true, "apiKey": "849d68a1a5261acab999d1dab7a6bb88", "secret": "106e79c2a6f77e860ebf5aa5c6405c5e", "uid": "igor.kroitor@gmail.com" },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ccxt",
-  "version": "1.14.92",
+  "version": "1.14.93",
   "description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 100+ exchanges",
   "main": "./ccxt.js",
   "unpkg": "build/ccxt.browser.js",

diff --git a/php/Exchange.php b/php/Exchange.php
@@ -30,7 +30,7 @@
 
 namespace ccxt;
 
-$version = '1.14.92';
+$version = '1.14.93';
 
 // rounding mode
 const TRUNCATE = 0;

diff --git a/php/cointiger.php b/php/cointiger.php
@@ -354,7 +354,7 @@ public function fetch_balance ($params = array ()) {
             }
             $account = $this->account ();
             $account['used'] = floatval ($balance['lock']);
-            $account['free'] = $balance['normal'];
+            $account['free'] = floatval ($balance['normal']);
             $account['total'] = $this->sum ($account['used'], $account['free']);
             $result[$code] = $account;
         }

diff --git a/python/ccxt/__init__.py b/python/ccxt/__init__.py
@@ -22,7 +22,7 @@
 
 # ----------------------------------------------------------------------------
 
-__version__ = '1.14.92'
+__version__ = '1.14.93'
 
 # ----------------------------------------------------------------------------
 

diff --git a/python/ccxt/async/__init__.py b/python/ccxt/async/__init__.py
@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.14.92'
+__version__ = '1.14.93'
 
 # -----------------------------------------------------------------------------
 

diff --git a/python/ccxt/async/base/exchange.py b/python/ccxt/async/base/exchange.py
@@ -2,7 +2,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.14.92'
+__version__ = '1.14.93'
 
 # -----------------------------------------------------------------------------
 

diff --git a/python/ccxt/async/cointiger.py b/python/ccxt/async/cointiger.py
@@ -350,7 +350,7 @@ async def fetch_balance(self, params={}):
                 code = self.currencies_by_id[id]['code']
             account = self.account()
             account['used'] = float(balance['lock'])
-            account['free'] = balance['normal']
+            account['free'] = float(balance['normal'])
             account['total'] = self.sum(account['used'], account['free'])
             result[code] = account
         return self.parse_balance(result)

diff --git a/python/ccxt/base/exchange.py b/python/ccxt/base/exchange.py
@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.14.92'
+__version__ = '1.14.93'
 
 # -----------------------------------------------------------------------------
 

diff --git a/python/ccxt/cointiger.py b/python/ccxt/cointiger.py
@@ -350,7 +350,7 @@ def fetch_balance(self, params={}):
                 code = self.currencies_by_id[id]['code']
             account = self.account()
             account['used'] = float(balance['lock'])
-            account['free'] = balance['normal']
+            account['free'] = float(balance['normal'])
             account['total'] = self.sum(account['used'], account['free'])
             result[code] = account
         return self.parse_balance(result)