1.67.65

[ci skip]
ccxt · Jan 14, 2022 · 35e5716 · 35e5716
1 parent 440832f
commit 35e5716
Show file tree

Hide file tree

Showing 19 changed files with 68 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -221,13 +221,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/ccxt@1.67.64/dist/ccxt.browser.js
-* unpkg: https://unpkg.com/ccxt@1.67.64/dist/ccxt.browser.js
+* jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@1.67.65/dist/ccxt.browser.js
+* unpkg: https://unpkg.com/ccxt@1.67.65/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/ccxt@1.67.64/dist/ccxt.browser.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@1.67.65/dist/ccxt.browser.js"></script>
 ```
 
 Creates a global `ccxt` object:

diff --git a/ccxt.js b/ccxt.js
@@ -36,7 +36,7 @@ const Exchange  = require ('./js/base/Exchange')
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
 
-const version = '1.67.64'
+const version = '1.67.65'
 
 Exchange.ccxtVersion = version
 

diff --git a/dist/ccxt.browser.js b/dist/ccxt.browser.js
@@ -44,7 +44,7 @@ const Exchange  = require ('./js/base/Exchange')
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
 
-const version = '1.67.64'
+const version = '1.67.65'
 
 Exchange.ccxtVersion = version
 
@@ -74130,9 +74130,17 @@ module.exports = class ftx extends Exchange {
         //         "baseCurrency": "BCHA",
         //         "quoteCurrency": "USD"
         //     }
+        //
         const id = this.safeString (trade, 'id');
         const takerOrMaker = this.safeString (trade, 'liquidity');
-        const marketId = this.safeString (trade, 'market');
+        // a workaround for the OTC trades, they don't have a symbol
+        const baseId = this.safeString (trade, 'baseCurrency');
+        const quoteId = this.safeString (trade, 'quoteCurrency');
+        let defaultMarketId = undefined;
+        if ((baseId !== undefined) && (quoteId !== undefined)) {
+            defaultMarketId = baseId + '-' + quoteId;
+        }
+        const marketId = this.safeString (trade, 'market', defaultMarketId);
         market = this.safeMarket (marketId, market);
         const symbol = market['symbol'];
         const timestamp = this.parse8601 (this.safeString (trade, 'time'));

diff --git a/doc/readme.rst b/doc/readme.rst
@@ -1957,14 +1957,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/ccxt@1.67.64/dist/ccxt.browser.js
- * unpkg: https://unpkg.com/ccxt@1.67.64/dist/ccxt.browser.js
+ * jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@1.67.65/dist/ccxt.browser.js
+ * unpkg: https://unpkg.com/ccxt@1.67.65/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-block:: HTML
 
-   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@1.67.64/dist/ccxt.browser.js"></script>
+   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@1.67.65/dist/ccxt.browser.js"></script>
 
 Creates a global ``ccxt`` object:
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ccxt",
-  "version": "1.67.64",
+  "version": "1.67.65",
   "description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 130+ exchanges",
   "main": "./ccxt.js",
   "unpkg": "dist/ccxt.browser.js",

diff --git a/php/Exchange.php b/php/Exchange.php
diff --git a/php/async/Exchange.php b/php/async/Exchange.php
@@ -28,11 +28,11 @@
 
 include 'Throttle.php';
 
-$version = '1.67.64';
+$version = '1.67.65';
 
 class Exchange extends \ccxt\Exchange {
 
-    const VERSION = '1.67.64';
+    const VERSION = '1.67.65';
 
     public static $loop;
     public static $kernel;

diff --git a/php/async/ftx.php b/php/async/ftx.php
@@ -991,9 +991,17 @@ public function parse_trade($trade, $market = null) {
         //         "baseCurrency" => "BCHA",
         //         "quoteCurrency" => "USD"
         //     }
+        //
         $id = $this->safe_string($trade, 'id');
         $takerOrMaker = $this->safe_string($trade, 'liquidity');
-        $marketId = $this->safe_string($trade, 'market');
+        // a workaround for the OTC trades, they don't have a $symbol
+        $baseId = $this->safe_string($trade, 'baseCurrency');
+        $quoteId = $this->safe_string($trade, 'quoteCurrency');
+        $defaultMarketId = null;
+        if (($baseId !== null) && ($quoteId !== null)) {
+            $defaultMarketId = $baseId . '-' . $quoteId;
+        }
+        $marketId = $this->safe_string($trade, 'market', $defaultMarketId);
         $market = $this->safe_market($marketId, $market);
         $symbol = $market['symbol'];
         $timestamp = $this->parse8601($this->safe_string($trade, 'time'));

diff --git a/php/ftx.php b/php/ftx.php
diff --git a/python/README.md b/python/README.md
@@ -221,13 +221,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/ccxt@1.67.64/dist/ccxt.browser.js
-* unpkg: https://unpkg.com/ccxt@1.67.64/dist/ccxt.browser.js
+* jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@1.67.65/dist/ccxt.browser.js
+* unpkg: https://unpkg.com/ccxt@1.67.65/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/ccxt@1.67.64/dist/ccxt.browser.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@1.67.65/dist/ccxt.browser.js"></script>
 ```
 
 Creates a global `ccxt` object:

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

diff --git a/python/ccxt/async_support/__init__.py b/python/ccxt/async_support/__init__.py
@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.67.64'
+__version__ = '1.67.65'
 
 # -----------------------------------------------------------------------------
 

diff --git a/python/ccxt/async_support/base/exchange.py b/python/ccxt/async_support/base/exchange.py
@@ -2,7 +2,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.67.64'
+__version__ = '1.67.65'
 
 # -----------------------------------------------------------------------------
 

diff --git a/python/ccxt/async_support/ftx.py b/python/ccxt/async_support/ftx.py
@@ -984,9 +984,16 @@ def parse_trade(self, trade, market=None):
         #         "baseCurrency": "BCHA",
         #         "quoteCurrency": "USD"
         #     }
+        #
         id = self.safe_string(trade, 'id')
         takerOrMaker = self.safe_string(trade, 'liquidity')
-        marketId = self.safe_string(trade, 'market')
+        # a workaround for the OTC trades, they don't have a symbol
+        baseId = self.safe_string(trade, 'baseCurrency')
+        quoteId = self.safe_string(trade, 'quoteCurrency')
+        defaultMarketId = None
+        if (baseId is not None) and (quoteId is not None):
+            defaultMarketId = baseId + '-' + quoteId
+        marketId = self.safe_string(trade, 'market', defaultMarketId)
         market = self.safe_market(marketId, market)
         symbol = market['symbol']
         timestamp = self.parse8601(self.safe_string(trade, 'time'))

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

diff --git a/python/ccxt/ftx.py b/python/ccxt/ftx.py
diff --git a/python/package.json b/python/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ccxt",
-  "version": "1.67.64",
+  "version": "1.67.65",
   "description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 130+ exchanges",
   "main": "./ccxt.js",
   "unpkg": "dist/ccxt.browser.js",

diff --git a/wiki/Install.md b/wiki/Install.md
@@ -40,13 +40,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/ccxt@1.67.64/dist/ccxt.browser.js
-* unpkg: https://unpkg.com/ccxt@1.67.64/dist/ccxt.browser.js
+* jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@1.67.65/dist/ccxt.browser.js
+* unpkg: https://unpkg.com/ccxt@1.67.65/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/ccxt@1.67.64/dist/ccxt.browser.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@1.67.65/dist/ccxt.browser.js"></script>
 ```
 
 Creates a global `ccxt` object: