Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ccxt-dev/ccxt
Browse files Browse the repository at this point in the history
  • Loading branch information
@kroitor
kroitor committed Dec 30, 2017
2 parents 7ee55bb + d484388 commit 15afad6
Show file tree
Hide file tree
Showing 15 changed files with 127 additions and 17 deletions.
30 changes: 26 additions & 4 deletions build/ccxt.browser.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ccxt.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const errors = require ('./js/base/errors')
//-----------------------------------------------------------------------------
// this is updated by vss.js when building

const version = '1.10.529'
const version = '1.10.531'

Exchange.ccxtVersion = version

Expand Down
22 changes: 22 additions & 0 deletions js/therock.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,28 @@ module.exports = class therock extends Exchange {
'maker': 0.02 / 100,
'taker': 0.2 / 100,
},
'funding': {
'tierBased': false,
'percentage': false,
'withdraw': {
'BTC': 0.0005,
'BCH': 0.0005,
'PPC': 0.02,
'ETH': 0.001,
'ZEC': 0.001,
'LTC': 0.002,
'EUR': 2.5, // worst-case scenario: https://therocktrading.com/en/pages/fees
},
'deposit': {
'BTC': 0,
'BCH': 0,
'PPC': 0,
'ETH': 0,
'ZEC': 0,
'LTC': 0,
'EUR': 0,
},
},
},
});
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ccxt",
"version": "1.10.529",
"version": "1.10.531",
"description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 90+ exchanges",
"main": "./ccxt.js",
"unpkg": "build/ccxt.browser.js",
Expand Down
2 changes: 1 addition & 1 deletion php/Exchange.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

namespace ccxt;

$version = '1.10.529';
$version = '1.10.531';

abstract class Exchange {

Expand Down
4 changes: 2 additions & 2 deletions php/bithumb.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ public function create_order ($symbol, $type, $side, $amount, $price = null, $pa
$this->load_markets();
$market = $this->market ($symbol);
$request = null;
$method = 'privatePost';
$method = 'privatePostTrade';
if ($type == 'limit') {
$request = array (
'order_currency' => $market['id'],
Expand All @@ -238,7 +238,7 @@ public function create_order ($symbol, $type, $side, $amount, $price = null, $pa
'price' => $price,
'type' => ($side == 'buy') ? 'bid' : 'ask',
);
$method .= 'TradePlace';
$method .= 'Place';
} else if ($type == 'market') {
$request = array (
'currency' => $market['id'],
Expand Down
22 changes: 22 additions & 0 deletions php/therock.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,28 @@ public function describe () {
'maker' => 0.02 / 100,
'taker' => 0.2 / 100,
),
'funding' => array (
'tierBased' => false,
'percentage' => false,
'withdraw' => array (
'BTC' => 0.0005,
'BCH' => 0.0005,
'PPC' => 0.02,
'ETH' => 0.001,
'ZEC' => 0.001,
'LTC' => 0.002,
'EUR' => 2.5, // worst-case scenario => https://therocktrading.com/en/pages/fees
),
'deposit' => array (
'BTC' => 0,
'BCH' => 0,
'PPC' => 0,
'ETH' => 0,
'ZEC' => 0,
'LTC' => 0,
'EUR' => 0,
),
),
),
));
}
Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

# ----------------------------------------------------------------------------

__version__ = '1.10.529'
__version__ = '1.10.531'

# ----------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/async/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# -----------------------------------------------------------------------------

__version__ = '1.10.529'
__version__ = '1.10.531'

# -----------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/async/base/exchange.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# -----------------------------------------------------------------------------

__version__ = '1.10.529'
__version__ = '1.10.531'

# -----------------------------------------------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions python/ccxt/async/bithumb.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ async def create_order(self, symbol, type, side, amount, price=None, params={}):
await self.load_markets()
market = self.market(symbol)
request = None
method = 'privatePost'
method = 'privatePostTrade'
if type == 'limit':
request = {
'order_currency': market['id'],
Expand All @@ -228,7 +228,7 @@ async def create_order(self, symbol, type, side, amount, price=None, params={}):
'price': price,
'type': 'bid' if (side == 'buy') else 'ask',
}
method += 'TradePlace'
method += 'Place'
elif type == 'market':
request = {
'currency': market['id'],
Expand Down
22 changes: 22 additions & 0 deletions python/ccxt/async/therock.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,28 @@ def describe(self):
'maker': 0.02 / 100,
'taker': 0.2 / 100,
},
'funding': {
'tierBased': False,
'percentage': False,
'withdraw': {
'BTC': 0.0005,
'BCH': 0.0005,
'PPC': 0.02,
'ETH': 0.001,
'ZEC': 0.001,
'LTC': 0.002,
'EUR': 2.5, # worst-case scenario: https://therocktrading.com/en/pages/fees
},
'deposit': {
'BTC': 0,
'BCH': 0,
'PPC': 0,
'ETH': 0,
'ZEC': 0,
'LTC': 0,
'EUR': 0,
},
},
},
})

Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/base/exchange.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# -----------------------------------------------------------------------------

__version__ = '1.10.529'
__version__ = '1.10.531'

# -----------------------------------------------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions python/ccxt/bithumb.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ def create_order(self, symbol, type, side, amount, price=None, params={}):
self.load_markets()
market = self.market(symbol)
request = None
method = 'privatePost'
method = 'privatePostTrade'
if type == 'limit':
request = {
'order_currency': market['id'],
Expand All @@ -228,7 +228,7 @@ def create_order(self, symbol, type, side, amount, price=None, params={}):
'price': price,
'type': 'bid' if (side == 'buy') else 'ask',
}
method += 'TradePlace'
method += 'Place'
elif type == 'market':
request = {
'currency': market['id'],
Expand Down
22 changes: 22 additions & 0 deletions python/ccxt/therock.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,28 @@ def describe(self):
'maker': 0.02 / 100,
'taker': 0.2 / 100,
},
'funding': {
'tierBased': False,
'percentage': False,
'withdraw': {
'BTC': 0.0005,
'BCH': 0.0005,
'PPC': 0.02,
'ETH': 0.001,
'ZEC': 0.001,
'LTC': 0.002,
'EUR': 2.5, # worst-case scenario: https://therocktrading.com/en/pages/fees
},
'deposit': {
'BTC': 0,
'BCH': 0,
'PPC': 0,
'ETH': 0,
'ZEC': 0,
'LTC': 0,
'EUR': 0,
},
},
},
})

Expand Down

0 comments on commit 15afad6

Please sign in to comment.