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

ccxt · Jun 5, 2018 · 7ce90fb · 7ce90fb
2 parents 51a9bd0 + 57ea222
commit 7ce90fb
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 13 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.124'
+const version = '1.14.125'
 
 Exchange.ccxtVersion = version
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ccxt",
-  "version": "1.14.124",
+  "version": "1.14.125",
   "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.124';
+$version = '1.14.125';
 
 // rounding mode
 const TRUNCATE = 0;

diff --git a/php/poloniex.php b/php/poloniex.php
@@ -128,6 +128,18 @@ public function describe () {
                 'STR' => 'XLM',
                 'BCC' => 'BTCtalkcoin',
             ),
+            'options' => array (
+                'limits' => array (
+                    'cost' => array (
+                        'min' => array (
+                            'BTC' => 0.0001,
+                            'ETH' => 0.0001,
+                            'XMR' => 0.0001,
+                            'USDT' => 1.0,
+                        ),
+                    ),
+                ),
+            ),
         ));
     }
 
@@ -187,6 +199,7 @@ public function fetch_markets () {
             $base = $this->common_currency_code($base);
             $quote = $this->common_currency_code($quote);
             $symbol = $base . '/' . $quote;
+            $minCost = $this->safe_float($this->options['limits']['cost']['min'], $quote, 0.0);
             $result[] = array_merge ($this->fees['trading'], array (
                 'id' => $id,
                 'symbol' => $symbol,
@@ -207,7 +220,7 @@ public function fetch_markets () {
                         'max' => 1000000000,
                     ),
                     'cost' => array (
-                        'min' => 0.00000000,
+                        'min' => $minCost,
                         'max' => 1000000000,
                     ),
                 ),

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

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

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

diff --git a/python/ccxt/async/poloniex.py b/python/ccxt/async/poloniex.py
@@ -142,6 +142,18 @@ def describe(self):
                 'STR': 'XLM',
                 'BCC': 'BTCtalkcoin',
             },
+            'options': {
+                'limits': {
+                    'cost': {
+                        'min': {
+                            'BTC': 0.0001,
+                            'ETH': 0.0001,
+                            'XMR': 0.0001,
+                            'USDT': 1.0,
+                        },
+                    },
+                },
+            },
         })
 
     def calculate_fee(self, symbol, type, side, amount, price, takerOrMaker='taker', params={}):
@@ -196,6 +208,7 @@ async def fetch_markets(self):
             base = self.common_currency_code(base)
             quote = self.common_currency_code(quote)
             symbol = base + '/' + quote
+            minCost = self.safe_float(self.options['limits']['cost']['min'], quote, 0.0)
             result.append(self.extend(self.fees['trading'], {
                 'id': id,
                 'symbol': symbol,
@@ -216,7 +229,7 @@ async def fetch_markets(self):
                         'max': 1000000000,
                     },
                     'cost': {
-                        'min': 0.00000000,
+                        'min': minCost,
                         'max': 1000000000,
                     },
                 },

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

diff --git a/python/ccxt/poloniex.py b/python/ccxt/poloniex.py
@@ -142,6 +142,18 @@ def describe(self):
                 'STR': 'XLM',
                 'BCC': 'BTCtalkcoin',
             },
+            'options': {
+                'limits': {
+                    'cost': {
+                        'min': {
+                            'BTC': 0.0001,
+                            'ETH': 0.0001,
+                            'XMR': 0.0001,
+                            'USDT': 1.0,
+                        },
+                    },
+                },
+            },
         })
 
     def calculate_fee(self, symbol, type, side, amount, price, takerOrMaker='taker', params={}):
@@ -196,6 +208,7 @@ def fetch_markets(self):
             base = self.common_currency_code(base)
             quote = self.common_currency_code(quote)
             symbol = base + '/' + quote
+            minCost = self.safe_float(self.options['limits']['cost']['min'], quote, 0.0)
             result.append(self.extend(self.fees['trading'], {
                 'id': id,
                 'symbol': symbol,
@@ -216,7 +229,7 @@ def fetch_markets(self):
                         'max': 1000000000,
                     },
                     'cost': {
-                        'min': 0.00000000,
+                        'min': minCost,
                         'max': 1000000000,
                     },
                 },