1.67.61

[ci skip]
ccxt · Jan 14, 2022 · 2f28a9d · 2f28a9d
1 parent bc32146
commit 2f28a9d
Show file tree

Hide file tree

Showing 19 changed files with 60 additions and 63 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.60/dist/ccxt.browser.js
-* unpkg: https://unpkg.com/ccxt@1.67.60/dist/ccxt.browser.js
+* jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@1.67.61/dist/ccxt.browser.js
+* unpkg: https://unpkg.com/ccxt@1.67.61/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.60/dist/ccxt.browser.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@1.67.61/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.60'
+const version = '1.67.61'
 
 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.60'
+const version = '1.67.61'
 
 Exchange.ccxtVersion = version
 
@@ -107322,14 +107322,13 @@ module.exports = class mexc extends Exchange {
 
     async fetchTickers (symbols = undefined, params = {}) {
         await this.loadMarkets ();
-        const defaultType = this.safeString2 (this.options, 'fetchTickers', 'defaultType', 'spot');
-        const type = this.safeString (params, 'type', defaultType);
-        const query = this.omit (params, 'type');
-        let method = 'spotPublicGetMarketTicker';
-        if (type === 'swap') {
-            method = 'contractPublicGetTicker';
-        }
-        const response = await this[method] (this.extend (query));
+        let marketType = undefined;
+        [ marketType, params ] = this.handleMarketTypeAndParams ('fetchTickers', undefined, params);
+        const method = this.getSupportedMapping (marketType, {
+            'spot': 'spotPublicGetMarketTicker',
+            'swap': 'contractPublicGetTicker',
+        });
+        const response = await this[method] (this.extend (params));
         //
         //     {
         //         "success":true,

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.60/dist/ccxt.browser.js
- * unpkg: https://unpkg.com/ccxt@1.67.60/dist/ccxt.browser.js
+ * jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@1.67.61/dist/ccxt.browser.js
+ * unpkg: https://unpkg.com/ccxt@1.67.61/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.60/dist/ccxt.browser.js"></script>
+   <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@1.67.61/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.60",
+  "version": "1.67.61",
   "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.60';
+$version = '1.67.61';
 
 class Exchange extends \ccxt\Exchange {
 
-    const VERSION = '1.67.60';
+    const VERSION = '1.67.61';
 
     public static $loop;
     public static $kernel;

diff --git a/php/async/mexc.php b/php/async/mexc.php
@@ -658,14 +658,13 @@ public function fetch_spot_markets($params = array ()) {
 
     public function fetch_tickers($symbols = null, $params = array ()) {
         yield $this->load_markets();
-        $defaultType = $this->safe_string_2($this->options, 'fetchTickers', 'defaultType', 'spot');
-        $type = $this->safe_string($params, 'type', $defaultType);
-        $query = $this->omit($params, 'type');
-        $method = 'spotPublicGetMarketTicker';
-        if ($type === 'swap') {
-            $method = 'contractPublicGetTicker';
-        }
-        $response = yield $this->$method (array_merge($query));
+        $marketType = null;
+        list($marketType, $params) = $this->handle_market_type_and_params('fetchTickers', null, $params);
+        $method = $this->get_supported_mapping($marketType, array(
+            'spot' => 'spotPublicGetMarketTicker',
+            'swap' => 'contractPublicGetTicker',
+        ));
+        $response = yield $this->$method (array_merge($params));
         //
         //     {
         //         "success":true,

diff --git a/php/mexc.php b/php/mexc.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.60/dist/ccxt.browser.js
-* unpkg: https://unpkg.com/ccxt@1.67.60/dist/ccxt.browser.js
+* jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@1.67.61/dist/ccxt.browser.js
+* unpkg: https://unpkg.com/ccxt@1.67.61/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.60/dist/ccxt.browser.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@1.67.61/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.60'
+__version__ = '1.67.61'
 
 # ----------------------------------------------------------------------------
 

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

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.60'
+__version__ = '1.67.61'
 
 # -----------------------------------------------------------------------------
 

diff --git a/python/ccxt/async_support/mexc.py b/python/ccxt/async_support/mexc.py
@@ -646,13 +646,13 @@ async def fetch_spot_markets(self, params={}):
 
     async def fetch_tickers(self, symbols=None, params={}):
         await self.load_markets()
-        defaultType = self.safe_string_2(self.options, 'fetchTickers', 'defaultType', 'spot')
-        type = self.safe_string(params, 'type', defaultType)
-        query = self.omit(params, 'type')
-        method = 'spotPublicGetMarketTicker'
-        if type == 'swap':
-            method = 'contractPublicGetTicker'
-        response = await getattr(self, method)(self.extend(query))
+        marketType = None
+        marketType, params = self.handle_market_type_and_params('fetchTickers', None, params)
+        method = self.get_supported_mapping(marketType, {
+            'spot': 'spotPublicGetMarketTicker',
+            'swap': 'contractPublicGetTicker',
+        })
+        response = await getattr(self, method)(self.extend(params))
         #
         #     {
         #         "success":true,

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

diff --git a/python/ccxt/mexc.py b/python/ccxt/mexc.py
diff --git a/python/package.json b/python/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ccxt",
-  "version": "1.67.60",
+  "version": "1.67.61",
   "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.60/dist/ccxt.browser.js
-* unpkg: https://unpkg.com/ccxt@1.67.60/dist/ccxt.browser.js
+* jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@1.67.61/dist/ccxt.browser.js
+* unpkg: https://unpkg.com/ccxt@1.67.61/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.60/dist/ccxt.browser.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@1.67.61/dist/ccxt.browser.js"></script>
 ```
 
 Creates a global `ccxt` object: