Merge branch 'master' of https://github.com/ccxt-dev/ccxt

ccxt · May 30, 2018 · 0ea86a3 · 0ea86a3
2 parents d27f8c8 + bce87e7
commit 0ea86a3
Show file tree

Hide file tree

Showing 14 changed files with 17 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.93'
+const version = '1.14.94'
 
 Exchange.ccxtVersion = version
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ccxt",
-  "version": "1.14.93",
+  "version": "1.14.94",
   "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.93';
+$version = '1.14.94';
 
 // rounding mode
 const TRUNCATE = 0;

diff --git a/php/bittrex.php b/php/bittrex.php
@@ -150,6 +150,7 @@ public function describe () {
                 'UUID_INVALID' => '\\ccxt\\OrderNotFound',
                 'RATE_NOT_PROVIDED' => '\\ccxt\\InvalidOrder', // createLimitBuyOrder ('ETH/BTC', 1, 0)
                 'WHITELIST_VIOLATION_IP' => '\\ccxt\\PermissionDenied',
+                'INVALID_ORDER' => '\\ccxt\\InvalidOrder',
             ),
             'options' => array (
                 'parseOrderStatus' => false,

diff --git a/php/cointiger.php b/php/cointiger.php
@@ -486,7 +486,7 @@ public function create_order ($symbol, $type, $side, $amount, $price = null, $pa
         $timestamp = $this->milliseconds ();
         return array (
             'info' => $response,
-            'id' => (string) $response['order_id'],
+            'id' => (string) $response['data']['order_id'],
             'timestamp' => $timestamp,
             'datetime' => $this->iso8601 ($timestamp),
             'lastTradeTimestamp' => null,

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

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

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

diff --git a/python/ccxt/async/bittrex.py b/python/ccxt/async/bittrex.py
@@ -167,6 +167,7 @@ def describe(self):
                 'UUID_INVALID': OrderNotFound,
                 'RATE_NOT_PROVIDED': InvalidOrder,  # createLimitBuyOrder('ETH/BTC', 1, 0)
                 'WHITELIST_VIOLATION_IP': PermissionDenied,
+                'INVALID_ORDER': InvalidOrder,
             },
             'options': {
                 'parseOrderStatus': False,

diff --git a/python/ccxt/async/cointiger.py b/python/ccxt/async/cointiger.py
@@ -470,7 +470,7 @@ async def create_order(self, symbol, type, side, amount, price=None, params={}):
         timestamp = self.milliseconds()
         return {
             'info': response,
-            'id': str(response['order_id']),
+            'id': str(response['data']['order_id']),
             'timestamp': timestamp,
             'datetime': self.iso8601(timestamp),
             'lastTradeTimestamp': None,

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

diff --git a/python/ccxt/bittrex.py b/python/ccxt/bittrex.py
@@ -167,6 +167,7 @@ def describe(self):
                 'UUID_INVALID': OrderNotFound,
                 'RATE_NOT_PROVIDED': InvalidOrder,  # createLimitBuyOrder('ETH/BTC', 1, 0)
                 'WHITELIST_VIOLATION_IP': PermissionDenied,
+                'INVALID_ORDER': InvalidOrder,
             },
             'options': {
                 'parseOrderStatus': False,

diff --git a/python/ccxt/cointiger.py b/python/ccxt/cointiger.py
@@ -470,7 +470,7 @@ def create_order(self, symbol, type, side, amount, price=None, params={}):
         timestamp = self.milliseconds()
         return {
             'info': response,
-            'id': str(response['order_id']),
+            'id': str(response['data']['order_id']),
             'timestamp': timestamp,
             'datetime': self.iso8601(timestamp),
             'lastTradeTimestamp': None,