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

sakiyama · Sep 13, 2017 · a59b194 · a59b194
2 parents a5e9d0e + b334fe7
commit a59b194
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 11 deletions.
diff --git a/build/ccxt.browser.js b/build/ccxt.browser.js
diff --git a/build/ccxt.es5.js b/build/ccxt.es5.js
diff --git a/build/ccxt.php b/build/ccxt.php
@@ -44,7 +44,7 @@ class DDoSProtection       extends NetworkError  {}
 class RequestTimeout       extends NetworkError  {}
 class ExchangeNotAvailable extends NetworkError  {}
 
-$version = '1.6.99';
+$version = '1.6.100';
 
 $curl_errors = array (
     0 => 'CURLE_OK',
@@ -14966,6 +14966,9 @@ public function __construct ($options = array ()) {
             'markets' => array (
                 'BTC/CNY' => array ( 'id' => 'btc_cny', 'symbol' => 'BTC/CNY', 'base' => 'BTC', 'quote' => 'CNY' ),
                 'LTC/CNY' => array ( 'id' => 'ltc_cny', 'symbol' => 'LTC/CNY', 'base' => 'LTC', 'quote' => 'CNY' ),
+                'ETH/CNY' => array ( 'id' => 'eth_cny', 'symbol' => 'ETH/CNY', 'base' => 'ETH', 'quote' => 'CNY' ),
+                'ETC/CNY' => array ( 'id' => 'etc_cny', 'symbol' => 'ETC/CNY', 'base' => 'ETC', 'quote' => 'CNY' ),
+                'BCH/CNY' => array ( 'id' => 'bcc_cny', 'symbol' => 'BCH/CNY', 'base' => 'BCH', 'quote' => 'CNY' ),
             ),
         ), $options));
     }

diff --git a/ccxt.js b/ccxt.js
@@ -38,7 +38,7 @@ const CryptoJS = require ('crypto-js')
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
 
-const version = '1.6.99'
+const version = '1.6.100'
 
 //-----------------------------------------------------------------------------
 // platform detection

diff --git a/ccxt.php b/ccxt.php
@@ -44,7 +44,7 @@ class DDoSProtection       extends NetworkError  {}
 class RequestTimeout       extends NetworkError  {}
 class ExchangeNotAvailable extends NetworkError  {}
 
-$version = '1.6.99';
+$version = '1.6.100';
 
 $curl_errors = array (
     0 => 'CURLE_OK',

diff --git a/ccxt/async/exchanges.py b/ccxt/async/exchanges.py
diff --git a/ccxt/exchanges.py b/ccxt/exchanges.py
@@ -13214,6 +13214,9 @@ def __init__(self, config={}):
             'markets': {
                 'BTC/CNY': {'id': 'btc_cny', 'symbol': 'BTC/CNY', 'base': 'BTC', 'quote': 'CNY'},
                 'LTC/CNY': {'id': 'ltc_cny', 'symbol': 'LTC/CNY', 'base': 'LTC', 'quote': 'CNY'},
+                'ETH/CNY': {'id': 'eth_cny', 'symbol': 'ETH/CNY', 'base': 'ETH', 'quote': 'CNY'},
+                'ETC/CNY': {'id': 'etc_cny', 'symbol': 'ETC/CNY', 'base': 'ETC', 'quote': 'CNY'},
+                'BCH/CNY': {'id': 'bcc_cny', 'symbol': 'BCH/CNY', 'base': 'BCH', 'quote': 'CNY'},
             },
         }
         params.update(config)

diff --git a/ccxt/version.py b/ccxt/version.py
@@ -26,6 +26,6 @@
 
 #------------------------------------------------------------------------------
 
-__version__ = '1.6.99'
+__version__ = '1.6.100'
 
 #==============================================================================
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ccxt",
-  "version": "1.6.99",
+  "version": "1.6.100",
   "description": "A library for cryptocurrency trading and e-commerce with support for many bitcoin/ether/altcoin exchange markets and merchant APIs",
   "main": "build/ccxt.es5.js",
   "unpkg": "build/ccxt.browser.js",