1.10.899

[ci skip]
dongyi · Jan 29, 2018 · b12702b · b12702b
1 parent 337cbc7
commit b12702b
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 23 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.10.898'
+const version = '1.10.899'
 
 Exchange.ccxtVersion = version
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ccxt",
-  "version": "1.10.898",
+  "version": "1.10.899",
   "description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 90+ 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.10.898';
+$version = '1.10.899';
 
 abstract class Exchange {
 

diff --git a/php/dsx.php b/php/dsx.php
@@ -111,7 +111,8 @@ public function parse_ticker ($ticker, $market = null) {
             $symbol = $market['symbol'];
         $average = $this->safe_float($ticker, 'avg');
         if ($average !== null)
-            $average = 1 / $average;
+            if ($average > 0)
+                $average = 1 / $average;
         return array (
             'symbol' => $symbol,
             'timestamp' => $timestamp,

diff --git a/php/okcoinusd.php b/php/okcoinusd.php
@@ -125,8 +125,9 @@ public function describe () {
                 ),
             ),
             'exceptions' => array (
-                '1009' => '\\ccxt\\OrderNotFound',
-                '1013' => '\\ccxt\\InvalidOrder', // no order type
+                '1009' => '\\ccxt\\OrderNotFound', // for spot markets
+                '20015' => '\\ccxt\\OrderNotFound', // for future markets
+                '1013' => '\\ccxt\\InvalidOrder', // no contract type (PR-1101)
                 '1027' => '\\ccxt\\InvalidOrder', // createLimitBuyOrder(symbol, 0, 0) => Incorrect parameter may exceeded limits
                 '1002' => '\\ccxt\\InsufficientFunds', // The transaction amount exceed the balance
                 '10000' => '\\ccxt\\ExchangeError', // createLimitBuyOrder(symbol, null, null)

diff --git a/python/ccxt/__init__.py b/python/ccxt/__init__.py
@@ -28,7 +28,7 @@
 
 # ----------------------------------------------------------------------------
 
-__version__ = '1.10.898'
+__version__ = '1.10.899'
 
 # ----------------------------------------------------------------------------
 

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

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

diff --git a/python/ccxt/async/dsx.py b/python/ccxt/async/dsx.py
@@ -109,7 +109,8 @@ def parse_ticker(self, ticker, market=None):
             symbol = market['symbol']
         average = self.safe_float(ticker, 'avg')
         if average is not None:
-            average = 1 / average
+            if average > 0:
+                average = 1 / average
         return {
             'symbol': symbol,
             'timestamp': timestamp,

diff --git a/python/ccxt/async/okcoinusd.py b/python/ccxt/async/okcoinusd.py
@@ -133,8 +133,9 @@ def describe(self):
                 },
             },
             'exceptions': {
-                '1009': OrderNotFound,
-                '1013': InvalidOrder,  # no order type
+                '1009': OrderNotFound,  # for spot markets
+                '20015': OrderNotFound,  # for future markets
+                '1013': InvalidOrder,  # no contract type(PR-1101)
                 '1027': InvalidOrder,  # createLimitBuyOrder(symbol, 0, 0): Incorrect parameter may exceeded limits
                 '1002': InsufficientFunds,  # The transaction amount exceed the balance
                 '10000': ExchangeError,  # createLimitBuyOrder(symbol, None, None)

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

diff --git a/python/ccxt/dsx.py b/python/ccxt/dsx.py
@@ -109,7 +109,8 @@ def parse_ticker(self, ticker, market=None):
             symbol = market['symbol']
         average = self.safe_float(ticker, 'avg')
         if average is not None:
-            average = 1 / average
+            if average > 0:
+                average = 1 / average
         return {
             'symbol': symbol,
             'timestamp': timestamp,

diff --git a/python/ccxt/okcoinusd.py b/python/ccxt/okcoinusd.py
@@ -133,8 +133,9 @@ def describe(self):
                 },
             },
             'exceptions': {
-                '1009': OrderNotFound,
-                '1013': InvalidOrder,  # no order type
+                '1009': OrderNotFound,  # for spot markets
+                '20015': OrderNotFound,  # for future markets
+                '1013': InvalidOrder,  # no contract type(PR-1101)
                 '1027': InvalidOrder,  # createLimitBuyOrder(symbol, 0, 0): Incorrect parameter may exceeded limits
                 '1002': InsufficientFunds,  # The transaction amount exceed the balance
                 '10000': ExchangeError,  # createLimitBuyOrder(symbol, None, None)