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

ccxt · Jun 5, 2018 · f1b1d17 · f1b1d17
2 parents 92d4d80 + 7964d07
commit f1b1d17
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 17 deletions.
diff --git a/build/ccxt.browser.js b/build/ccxt.browser.js
diff --git a/ccxt.js b/ccxt.js
@@ -37,7 +37,7 @@ const Exchange  = require ('./js/base/Exchange')
 //-----------------------------------------------------------------------------
 // this is updated by vss.js when building
 
-const version = '1.14.125'
+const version = '1.14.126'
 
 Exchange.ccxtVersion = version
 

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

diff --git a/php/Exchange.php b/php/Exchange.php
@@ -30,7 +30,7 @@
 
 namespace ccxt;
 
-$version = '1.14.125';
+$version = '1.14.126';
 
 // rounding mode
 const TRUNCATE = 0;

diff --git a/php/southxchange.php b/php/southxchange.php
@@ -60,6 +60,7 @@ public function describe () {
             ),
             'commonCurrencies' => array (
                 'SMT' => 'SmartNode',
+                'MTC' => 'Marinecoin',
             ),
         ));
     }

diff --git a/php/vaultoro.php b/php/vaultoro.php
@@ -64,8 +64,8 @@ public function fetch_markets () {
         $result = array ();
         $markets = $this->publicGetMarkets ();
         $market = $markets['data'];
-        $baseId = $market['BaseCurrency'];
-        $quoteId = $market['MarketCurrency'];
+        $baseId = $market['MarketCurrency'];
+        $quoteId = $market['BaseCurrency'];
         $base = $this->common_currency_code($baseId);
         $quote = $this->common_currency_code($quoteId);
         $symbol = $base . '/' . $quote;

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

diff --git a/python/ccxt/async/__init__.py b/python/ccxt/async/__init__.py
@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.14.125'
+__version__ = '1.14.126'
 
 # -----------------------------------------------------------------------------
 

diff --git a/python/ccxt/async/base/exchange.py b/python/ccxt/async/base/exchange.py
@@ -2,7 +2,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '1.14.125'
+__version__ = '1.14.126'
 
 # -----------------------------------------------------------------------------
 

diff --git a/python/ccxt/async/southxchange.py b/python/ccxt/async/southxchange.py
@@ -61,6 +61,7 @@ def describe(self):
             },
             'commonCurrencies': {
                 'SMT': 'SmartNode',
+                'MTC': 'Marinecoin',
             },
         })
 

diff --git a/python/ccxt/async/vaultoro.py b/python/ccxt/async/vaultoro.py
@@ -62,8 +62,8 @@ async def fetch_markets(self):
         result = []
         markets = await self.publicGetMarkets()
         market = markets['data']
-        baseId = market['BaseCurrency']
-        quoteId = market['MarketCurrency']
+        baseId = market['MarketCurrency']
+        quoteId = market['BaseCurrency']
         base = self.common_currency_code(baseId)
         quote = self.common_currency_code(quoteId)
         symbol = base + '/' + quote

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

diff --git a/python/ccxt/southxchange.py b/python/ccxt/southxchange.py
@@ -61,6 +61,7 @@ def describe(self):
             },
             'commonCurrencies': {
                 'SMT': 'SmartNode',
+                'MTC': 'Marinecoin',
             },
         })
 

diff --git a/python/ccxt/vaultoro.py b/python/ccxt/vaultoro.py
@@ -62,8 +62,8 @@ def fetch_markets(self):
         result = []
         markets = self.publicGetMarkets()
         market = markets['data']
-        baseId = market['BaseCurrency']
-        quoteId = market['MarketCurrency']
+        baseId = market['MarketCurrency']
+        quoteId = market['BaseCurrency']
         base = self.common_currency_code(baseId)
         quote = self.common_currency_code(quoteId)
         symbol = base + '/' + quote