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

README.md

@@ -218,13 +218,13 @@ console.log (ccxt.exchanges) // print all available exchanges
 
 All-in-one browser bundle (dependencies included), served from a CDN of your choice:
 
-* jsDelivr: https://cdn.jsdelivr.net/npm/[email protected].48/dist/ccxt.browser.js
-* unpkg: https://unpkg.com/[email protected].48/dist/ccxt.browser.js
+* jsDelivr: https://cdn.jsdelivr.net/npm/[email protected].49/dist/ccxt.browser.js
+* unpkg: https://unpkg.com/[email protected].49/dist/ccxt.browser.js
 
 CDNs are not updated in real-time and may have delays. Defaulting to the most recent version without specifying the version number is not recommended. Please, keep in mind that we are not responsible for the correct operation of those CDN servers.
 
 ```HTML
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].48/dist/ccxt.browser.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].49/dist/ccxt.browser.js"></script>
 ```
 
 Creates a global `ccxt` object:

ccxt.js

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

dist/ccxt.browser.js

@@ -43,7 +43,7 @@ const Exchange  = require ('./js/base/Exchange')
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
 
-const version = '1.27.48'
+const version = '1.27.49'
 
 Exchange.ccxtVersion = version
 
@@ -2911,7 +2911,10 @@ module.exports = class aofex extends Exchange {
             base = market['base'];
             quote = market['quote'];
         }
-        const timestamp = this.parse8601 (this.safeString (order, 'ctime')) - 28800000; // 8 hours, adjust to UTC
+        let timestamp = this.parse8601 (this.safeString (order, 'ctime'));
+        if (timestamp !== undefined) {
+            timestamp -= 28800000; // 8 hours, adjust to UTC
+        }
         const orderType = this.safeString (order, 'type');
         const type = (orderType === '2') ? 'limit' : 'market';
         const side = this.safeString (order, 'side');

doc/README.rst

@@ -355,14 +355,14 @@ JavaScript (for use with the ``<script>`` tag):
 
 All-in-one browser bundle (dependencies included), served from a CDN of your choice:
 
--  jsDelivr: https://cdn.jsdelivr.net/npm/[email protected].48/dist/ccxt.browser.js
--  unpkg: https://unpkg.com/[email protected].48/dist/ccxt.browser.js
+-  jsDelivr: https://cdn.jsdelivr.net/npm/[email protected].49/dist/ccxt.browser.js
+-  unpkg: https://unpkg.com/[email protected].49/dist/ccxt.browser.js
 
 CDNs are not updated in real-time and may have delays. Defaulting to the most recent version without specifying the version number is not recommended. Please, keep in mind that we are not responsible for the correct operation of those CDN servers.
 
 .. code:: html
 
-   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].48/dist/ccxt.browser.js"></script>
+   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].49/dist/ccxt.browser.js"></script>
 
 Creates a global ``ccxt`` object:
 

doc/install.rst

@@ -62,14 +62,14 @@ JavaScript (for use with the ``<script>`` tag):
 
 All-in-one browser bundle (dependencies included), served from a CDN of your choice:
 
--  jsDelivr: https://cdn.jsdelivr.net/npm/[email protected].48/dist/ccxt.browser.js
--  unpkg: https://unpkg.com/[email protected].48/dist/ccxt.browser.js
+-  jsDelivr: https://cdn.jsdelivr.net/npm/[email protected].49/dist/ccxt.browser.js
+-  unpkg: https://unpkg.com/[email protected].49/dist/ccxt.browser.js
 
 You can obtain a live-updated version of the bundle by removing the version number from the URL (the ``@a.b.c`` thing) — however, we do not recommend to do that, as it may break your app eventually. Also, please keep in mind that we are not responsible for the correct operation of those CDN servers.
 
 .. code:: html
 
-   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].48/dist/ccxt.browser.js"></script>
+   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].49/dist/ccxt.browser.js"></script>
 
 Creates a global ``ccxt`` object:
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccxt",
-  "version": "1.27.48",
+  "version": "1.27.49",
   "description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 130+ exchanges",
   "main": "./ccxt.js",
   "unpkg": "dist/ccxt.browser.js",

php/aofex.php

@@ -730,7 +730,10 @@ public function parse_order($order, $market = null) {
             $base = $market['base'];
             $quote = $market['quote'];
         }
-        $timestamp = $this->parse8601($this->safe_string($order, 'ctime')) - 28800000; // 8 hours, adjust to UTC
+        $timestamp = $this->parse8601($this->safe_string($order, 'ctime'));
+        if ($timestamp !== null) {
+            $timestamp -= 28800000; // 8 hours, adjust to UTC
+        }
         $orderType = $this->safe_string($order, 'type');
         $type = ($orderType === '2') ? 'limit' : 'market';
         $side = $this->safe_string($order, 'side');

php/base/Exchange.php

@@ -35,7 +35,7 @@
 use Elliptic\EC;
 use BN\BN;
 
-$version = '1.27.48';
+$version = '1.27.49';
 
 // rounding mode
 const TRUNCATE = 0;
@@ -54,7 +54,7 @@
 
 class Exchange {
 
-    const VERSION = '1.27.48';
+    const VERSION = '1.27.49';
 
     public static $exchanges = array(
         '_1btcxe',

python/README.rst

@@ -355,14 +355,14 @@ JavaScript (for use with the ``<script>`` tag):
 
 All-in-one browser bundle (dependencies included), served from a CDN of your choice:
 
--  jsDelivr: https://cdn.jsdelivr.net/npm/[email protected].48/dist/ccxt.browser.js
--  unpkg: https://unpkg.com/[email protected].48/dist/ccxt.browser.js
+-  jsDelivr: https://cdn.jsdelivr.net/npm/[email protected].49/dist/ccxt.browser.js
+-  unpkg: https://unpkg.com/[email protected].49/dist/ccxt.browser.js
 
 CDNs are not updated in real-time and may have delays. Defaulting to the most recent version without specifying the version number is not recommended. Please, keep in mind that we are not responsible for the correct operation of those CDN servers.
 
 .. code:: html
 
-   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].48/dist/ccxt.browser.js"></script>
+   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].49/dist/ccxt.browser.js"></script>
 
 Creates a global ``ccxt`` object:
 

python/ccxt/__init__.py

@@ -22,7 +22,7 @@
 
 # ----------------------------------------------------------------------------
 
-__version__ = '1.27.48'
+__version__ = '1.27.49'
 
 # ----------------------------------------------------------------------------
 

python/ccxt/async_support/__init__.py

@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.27.48'
+__version__ = '1.27.49'
 
 # -----------------------------------------------------------------------------
 

python/ccxt/async_support/aofex.py

@@ -704,7 +704,9 @@ def parse_order(self, order, market=None):
             symbol = market['symbol']
             base = market['base']
             quote = market['quote']
-        timestamp = self.parse8601(self.safe_string(order, 'ctime')) - 28800000  # 8 hours, adjust to UTC
+        timestamp = self.parse8601(self.safe_string(order, 'ctime'))
+        if timestamp is not None:
+            timestamp -= 28800000  # 8 hours, adjust to UTC
         orderType = self.safe_string(order, 'type')
         type = 'limit' if (orderType == '2') else 'market'
         side = self.safe_string(order, 'side')

python/ccxt/async_support/base/exchange.py

@@ -2,7 +2,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.27.48'
+__version__ = '1.27.49'
 
 # -----------------------------------------------------------------------------
 

python/ccxt/base/exchange.py

@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.27.48'
+__version__ = '1.27.49'
 
 # -----------------------------------------------------------------------------
 

python/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccxt",
-  "version": "1.27.48",
+  "version": "1.27.49",
   "description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 130+ exchanges",
   "main": "./ccxt.js",
   "unpkg": "dist/ccxt.browser.js",

wiki/Install.md

@@ -58,13 +58,13 @@ If that does not help, please, follow here: https://github.com/nodejs/node-gyp#o
 
 All-in-one browser bundle (dependencies included), served from a CDN of your choice:
 
-* jsDelivr: https://cdn.jsdelivr.net/npm/[email protected].48/dist/ccxt.browser.js
-* unpkg: https://unpkg.com/[email protected].48/dist/ccxt.browser.js
+* jsDelivr: https://cdn.jsdelivr.net/npm/[email protected].49/dist/ccxt.browser.js
+* unpkg: https://unpkg.com/[email protected].49/dist/ccxt.browser.js
 
 You can obtain a live-updated version of the bundle by removing the version number from the URL (the `@a.b.c` thing) — however, we do not recommend to do that, as it may break your app eventually. Also, please keep in mind that we are not responsible for the correct operation of those CDN servers.
 
 ```HTML
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].48/dist/ccxt.browser.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].49/dist/ccxt.browser.js"></script>
 ```
 
 Creates a global `ccxt` object: