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

ccxt.js

@@ -37,7 +37,7 @@ const Exchange  = require ('./js/base/Exchange')
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
 
-const version = '1.10.1230'
+const version = '1.10.1231'
 
 Exchange.ccxtVersion = version
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccxt",
-  "version": "1.10.1230",
+  "version": "1.10.1231",
   "description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 90+ exchanges",
   "main": "./ccxt.js",
   "unpkg": "build/ccxt.browser.js",

php/Exchange.php

@@ -30,7 +30,7 @@
 
 namespace ccxt;
 
-$version = '1.10.1230';
+$version = '1.10.1231';
 
 abstract class Exchange {
 

php/binance.php

@@ -700,10 +700,15 @@ public function fetch_order ($id, $symbol = null, $params = array ()) {
             throw new ExchangeError ($this->id . ' fetchOrder requires a $symbol param');
         $this->load_markets();
         $market = $this->market ($symbol);
-        $response = $this->privateGetOrder (array_merge (array (
+        $origClientOrderId = $this->safe_value($params, 'origClientOrderId');
+        $request = array (
             'symbol' => $market['id'],
-            'orderId' => intval ($id),
-        ), $params));
+        );
+        if ($origClientOrderId !== null)
+            $request['origClientOrderId'] = $origClientOrderId;
+        else
+            $request['orderId'] = intval ($id);
+        $response = $this->privateGetOrder (array_merge ($request, $params));
         return $this->parse_order($response, $market);
     }
 

python/ccxt/__init__.py

@@ -28,7 +28,7 @@
 
 # ----------------------------------------------------------------------------
 
-__version__ = '1.10.1230'
+__version__ = '1.10.1231'
 
 # ----------------------------------------------------------------------------
 

python/ccxt/async/__init__.py

@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.10.1230'
+__version__ = '1.10.1231'
 
 # -----------------------------------------------------------------------------
 

python/ccxt/async/base/exchange.py

@@ -2,7 +2,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.10.1230'
+__version__ = '1.10.1231'
 
 # -----------------------------------------------------------------------------
 

python/ccxt/async/binance.py

@@ -683,10 +683,15 @@ async def fetch_order(self, id, symbol=None, params={}):
             raise ExchangeError(self.id + ' fetchOrder requires a symbol param')
         await self.load_markets()
         market = self.market(symbol)
-        response = await self.privateGetOrder(self.extend({
+        origClientOrderId = self.safe_value(params, 'origClientOrderId')
+        request = {
             'symbol': market['id'],
-            'orderId': int(id),
-        }, params))
+        }
+        if origClientOrderId is not None:
+            request['origClientOrderId'] = origClientOrderId
+        else:
+            request['orderId'] = int(id)
+        response = await self.privateGetOrder(self.extend(request, params))
         return self.parse_order(response, market)
 
     async def fetch_orders(self, symbol=None, since=None, limit=None, params={}):

python/ccxt/base/exchange.py

@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.10.1230'
+__version__ = '1.10.1231'
 
 # -----------------------------------------------------------------------------
 

python/ccxt/binance.py

@@ -683,10 +683,15 @@ def fetch_order(self, id, symbol=None, params={}):
             raise ExchangeError(self.id + ' fetchOrder requires a symbol param')
         self.load_markets()
         market = self.market(symbol)
-        response = self.privateGetOrder(self.extend({
+        origClientOrderId = self.safe_value(params, 'origClientOrderId')
+        request = {
             'symbol': market['id'],
-            'orderId': int(id),
-        }, params))
+        }
+        if origClientOrderId is not None:
+            request['origClientOrderId'] = origClientOrderId
+        else:
+            request['orderId'] = int(id)
+        response = self.privateGetOrder(self.extend(request, params))
         return self.parse_order(response, market)
 
     def fetch_orders(self, symbol=None, since=None, limit=None, params={}):