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.14.85'
+const version = '1.14.87'
 
 Exchange.ccxtVersion = version
 

js/lbank.js

@@ -19,7 +19,7 @@ module.exports = class lbank extends Exchange {
                 'fetchOHLCV': true,
                 'fetchOrder': true,
                 'fetchOrders': true,
-                'fetchOpenOrders': true,
+                'fetchOpenOrders': false, // status 0 API doesn't work
                 'fetchClosedOrders': true,
             },
             'timeframes': {
@@ -370,13 +370,19 @@ module.exports = class lbank extends Exchange {
     }
 
     async fetchOrder (id, symbol = undefined, params = {}) {
+        // Id can be a list of ids delimited by a comma
         await this.loadMarkets ();
         let market = this.market (symbol);
         let response = await this.privatePostOrdersInfo (this.extend ({
             'symbol': market['id'],
             'order_id': id,
         }, params));
-        return this.parseOrder (response['orders'][0], market);
+        let orders = this.parseOrders (response['orders'], market);
+        if (orders.length === 1) {
+            return orders[0];
+        } else {
+            return orders;
+        }
     }
 
     async fetchOrders (symbol = undefined, since = undefined, limit = undefined, params = {}) {
@@ -390,15 +396,8 @@ module.exports = class lbank extends Exchange {
         return this.parseOrders (response['orders'], undefined, since, limit);
     }
 
-    async fetchOpenOrders (symbol = undefined, since = undefined, limit = undefined, params = {}) {
-        let response = await this.fetchOrders (symbol, since, limit, this.extend ({
-            'status': 0,
-        }, params));
-        return response;
-    }
-
     async fetchClosedOrders (symbol = undefined, since = undefined, limit = undefined, params = {}) {
-        let orders = await this.fetchOrders (symbol, since, limit);
+        let orders = await this.fetchOrders (symbol, since, limit, params);
         let closed = this.filterBy (orders, 'status', 'closed');
         let cancelled = this.filterBy (orders, 'status', 'cancelled'); // cancelled orders may be partially filled
         return closed + cancelled;

package.json

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

php/Exchange.php

@@ -30,7 +30,7 @@
 
 namespace ccxt;
 
-$version = '1.14.85';
+$version = '1.14.87';
 
 // rounding mode
 const TRUNCATE = 0;

php/lbank.php

@@ -20,7 +20,7 @@ public function describe () {
                 'fetchOHLCV' => true,
                 'fetchOrder' => true,
                 'fetchOrders' => true,
-                'fetchOpenOrders' => true,
+                'fetchOpenOrders' => false, // status 0 API doesn't work
                 'fetchClosedOrders' => true,
             ),
             'timeframes' => array (
@@ -371,13 +371,19 @@ public function cancel_order ($id, $symbol = null, $params = array ()) {
     }
 
     public function fetch_order ($id, $symbol = null, $params = array ()) {
+        // Id can be a list of ids delimited by a comma
         $this->load_markets();
         $market = $this->market ($symbol);
         $response = $this->privatePostOrdersInfo (array_merge (array (
             'symbol' => $market['id'],
             'order_id' => $id,
         ), $params));
-        return $this->parse_order($response['orders'][0], $market);
+        $orders = $this->parse_orders($response['orders'], $market);
+        if (strlen ($orders) === 1) {
+            return $orders[0];
+        } else {
+            return $orders;
+        }
     }
 
     public function fetch_orders ($symbol = null, $since = null, $limit = null, $params = array ()) {
@@ -391,15 +397,8 @@ public function fetch_orders ($symbol = null, $since = null, $limit = null, $par
         return $this->parse_orders($response['orders'], null, $since, $limit);
     }
 
-    public function fetch_open_orders ($symbol = null, $since = null, $limit = null, $params = array ()) {
-        $response = $this->fetch_orders($symbol, $since, $limit, array_merge (array (
-            'status' => 0,
-        ), $params));
-        return $response;
-    }
-
     public function fetch_closed_orders ($symbol = null, $since = null, $limit = null, $params = array ()) {
-        $orders = $this->fetch_orders($symbol, $since, $limit);
+        $orders = $this->fetch_orders($symbol, $since, $limit, $params);
         $closed = $this->filter_by($orders, 'status', 'closed');
         $cancelled = $this->filter_by($orders, 'status', 'cancelled'); // $cancelled $orders may be partially filled
         return $closed . $cancelled;

python/ccxt/__init__.py

@@ -22,7 +22,7 @@
 
 # ----------------------------------------------------------------------------
 
-__version__ = '1.14.85'
+__version__ = '1.14.87'
 
 # ----------------------------------------------------------------------------
 

python/ccxt/async/__init__.py

@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.14.85'
+__version__ = '1.14.87'
 
 # -----------------------------------------------------------------------------
 

python/ccxt/async/base/exchange.py

@@ -2,7 +2,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.14.85'
+__version__ = '1.14.87'
 
 # -----------------------------------------------------------------------------
 

python/ccxt/async/lbank.py

@@ -24,7 +24,7 @@ def describe(self):
                 'fetchOHLCV': True,
                 'fetchOrder': True,
                 'fetchOrders': True,
-                'fetchOpenOrders': True,
+                'fetchOpenOrders': False,  # status 0 API doesn't work
                 'fetchClosedOrders': True,
             },
             'timeframes': {
@@ -355,13 +355,18 @@ async def cancel_order(self, id, symbol=None, params={}):
         return response
 
     async def fetch_order(self, id, symbol=None, params={}):
+        # Id can be a list of ids delimited by a comma
         await self.load_markets()
         market = self.market(symbol)
         response = await self.privatePostOrdersInfo(self.extend({
             'symbol': market['id'],
             'order_id': id,
         }, params))
-        return self.parse_order(response['orders'][0], market)
+        orders = self.parse_orders(response['orders'], market)
+        if len(orders) == 1:
+            return orders[0]
+        else:
+            return orders
 
     async def fetch_orders(self, symbol=None, since=None, limit=None, params={}):
         await self.load_markets()
@@ -373,14 +378,8 @@ async def fetch_orders(self, symbol=None, since=None, limit=None, params={}):
         }, params))
         return self.parse_orders(response['orders'], None, since, limit)
 
-    async def fetch_open_orders(self, symbol=None, since=None, limit=None, params={}):
-        response = await self.fetch_orders(symbol, since, limit, self.extend({
-            'status': 0,
-        }, params))
-        return response
-
     async def fetch_closed_orders(self, symbol=None, since=None, limit=None, params={}):
-        orders = await self.fetch_orders(symbol, since, limit)
+        orders = await self.fetch_orders(symbol, since, limit, params)
         closed = self.filter_by(orders, 'status', 'closed')
         cancelled = self.filter_by(orders, 'status', 'cancelled')  # cancelled orders may be partially filled
         return closed + cancelled

python/ccxt/base/exchange.py

@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.14.85'
+__version__ = '1.14.87'
 
 # -----------------------------------------------------------------------------
 

python/ccxt/lbank.py

@@ -24,7 +24,7 @@ def describe(self):
                 'fetchOHLCV': True,
                 'fetchOrder': True,
                 'fetchOrders': True,
-                'fetchOpenOrders': True,
+                'fetchOpenOrders': False,  # status 0 API doesn't work
                 'fetchClosedOrders': True,
             },
             'timeframes': {
@@ -355,13 +355,18 @@ def cancel_order(self, id, symbol=None, params={}):
         return response
 
     def fetch_order(self, id, symbol=None, params={}):
+        # Id can be a list of ids delimited by a comma
         self.load_markets()
         market = self.market(symbol)
         response = self.privatePostOrdersInfo(self.extend({
             'symbol': market['id'],
             'order_id': id,
         }, params))
-        return self.parse_order(response['orders'][0], market)
+        orders = self.parse_orders(response['orders'], market)
+        if len(orders) == 1:
+            return orders[0]
+        else:
+            return orders
 
     def fetch_orders(self, symbol=None, since=None, limit=None, params={}):
         self.load_markets()
@@ -373,14 +378,8 @@ def fetch_orders(self, symbol=None, since=None, limit=None, params={}):
         }, params))
         return self.parse_orders(response['orders'], None, since, limit)
 
-    def fetch_open_orders(self, symbol=None, since=None, limit=None, params={}):
-        response = self.fetch_orders(symbol, since, limit, self.extend({
-            'status': 0,
-        }, params))
-        return response
-
     def fetch_closed_orders(self, symbol=None, since=None, limit=None, params={}):
-        orders = self.fetch_orders(symbol, since, limit)
+        orders = self.fetch_orders(symbol, since, limit, params)
         closed = self.filter_by(orders, 'status', 'closed')
         cancelled = self.filter_by(orders, 'status', 'cancelled')  # cancelled orders may be partially filled
         return closed + cancelled