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 committed Jan 5, 2018
2 parents 6d92e12 + a66c7a0 commit 6a9177c
Show file tree
Hide file tree
Showing 17 changed files with 17 additions and 22 deletions.
7 changes: 3 additions & 4 deletions build/ccxt.browser.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ccxt.js
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.566'
const version = '1.10.569'

Exchange.ccxtVersion = version

Expand Down
4 changes: 2 additions & 2 deletions doc/manual.rst
Original file line number Diff line number Diff line change
Expand Up @@ -845,8 +845,8 @@ Unified API

The unified ccxt API is a subset of methods common among the exchanges. It currently contains the following methods:

- ``fetchMarkets ()``: Fetches a list of all available markets from an exchange and returns an abstracted JSON-decoded response, an array of markets. Some exchanges do not have means for obtaining a list of markets via their online API, for those the list of markets is hardcoded.
- ``loadMarkets ([reload])``: Loads the list of markets indexed by symbol and caches it with the exchange instance. Returns cached markets if loaded already, unless the ``reload = true`` flag is forced.
- ``fetchMarkets ()``: Fetches a list of all available markets from an exchange and returns an array of markets (objects with properties such as ``symbol``, ``base``, ``quote`` etc.). Some exchanges do not have means for obtaining a list of markets via their online API. For those, the list of markets is hardcoded.
- ``loadMarkets ([reload])``: Returns the list of markets as an object indexed by symbol and caches it with the exchange instance. Returns cached markets if loaded already, unless the ``reload = true`` flag is forced.
- ``fetchOrderBook (symbol[, params])``: Fetch L2/L3 order book for a particular market trading symbol.
- ``fetchL2OrderBook (symbol[, params])``: Level 2 (price-aggregated) order book for a particular symbol.
- ``fetchTrades (symbol[, since[, [limit, [params]]]])``: Fetch recent trades for a particular trading symbol.
Expand Down
1 change: 0 additions & 1 deletion js/binance.js
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,6 @@ module.exports = class binance extends Exchange {
'ADX': 2.0,
'ADA': 1.0,
'PPT': 0.1,
'PPT': 0.1,
'CMT': 15.0,
'XLM': 0.01,
'CND': 180.0,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ccxt",
"version": "1.10.566",
"version": "1.10.569",
"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
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

namespace ccxt;

$version = '1.10.566';
$version = '1.10.569';

abstract class Exchange {

Expand Down
1 change: 0 additions & 1 deletion php/binance.php
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ public function describe () {
'ADX' => 2.0,
'ADA' => 1.0,
'PPT' => 0.1,
'PPT' => 0.1,
'CMT' => 15.0,
'XLM' => 0.01,
'CND' => 180.0,
Expand Down
2 changes: 1 addition & 1 deletion php/independentreserve.php
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ public function create_order ($symbol, $type, $side, $amount, $price = null, $pa
$this->load_markets();
$market = $this->market ($symbol);
$capitalizedOrderType = $this->capitalize ($type);
$method = 'Place' . $capitalizedOrderType . 'Order';
$method = 'privatePostPlace' . $capitalizedOrderType . 'Order';
$orderType = $capitalizedOrderType;
$orderType .= ($side == 'sell') ? 'Offer' : 'Bid';
$order = $this->ordered (array (
Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

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

__version__ = '1.10.566'
__version__ = '1.10.569'

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

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

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

__version__ = '1.10.566'
__version__ = '1.10.569'

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

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

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

__version__ = '1.10.566'
__version__ = '1.10.569'

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

Expand Down
1 change: 0 additions & 1 deletion python/ccxt/async/binance.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@ def describe(self):
'ADX': 2.0,
'ADA': 1.0,
'PPT': 0.1,
'PPT': 0.1,
'CMT': 15.0,
'XLM': 0.01,
'CND': 180.0,
Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/async/independentreserve.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ async def create_order(self, symbol, type, side, amount, price=None, params={}):
await self.load_markets()
market = self.market(symbol)
capitalizedOrderType = self.capitalize(type)
method = 'Place' + capitalizedOrderType + 'Order'
method = 'privatePostPlace' + capitalizedOrderType + 'Order'
orderType = capitalizedOrderType
orderType += 'Offer' if (side == 'sell') else 'Bid'
order = self.ordered({
Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/base/exchange.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

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

__version__ = '1.10.566'
__version__ = '1.10.569'

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

Expand Down
1 change: 0 additions & 1 deletion python/ccxt/binance.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@ def describe(self):
'ADX': 2.0,
'ADA': 1.0,
'PPT': 0.1,
'PPT': 0.1,
'CMT': 15.0,
'XLM': 0.01,
'CND': 180.0,
Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/independentreserve.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def create_order(self, symbol, type, side, amount, price=None, params={}):
self.load_markets()
market = self.market(symbol)
capitalizedOrderType = self.capitalize(type)
method = 'Place' + capitalizedOrderType + 'Order'
method = 'privatePostPlace' + capitalizedOrderType + 'Order'
orderType = capitalizedOrderType
orderType += 'Offer' if (side == 'sell') else 'Bid'
order = self.ordered({
Expand Down
4 changes: 2 additions & 2 deletions wiki/Manual.md
Original file line number Diff line number Diff line change
Expand Up @@ -720,8 +720,8 @@ var_dump (new \ccxt\okcoinusd ()); // PHP

The unified ccxt API is a subset of methods common among the exchanges. It currently contains the following methods:

- `fetchMarkets ()`: Fetches a list of all available markets from an exchange and returns an abstracted JSON-decoded response, an array of markets. Some exchanges do not have means for obtaining a list of markets via their online API, for those the list of markets is hardcoded.
- `loadMarkets ([reload])`: Loads the list of markets indexed by symbol and caches it with the exchange instance. Returns cached markets if loaded already, unless the `reload = true` flag is forced.
- `fetchMarkets ()`: Fetches a list of all available markets from an exchange and returns an array of markets (objects with properties such as `symbol`, `base`, `quote` etc.). Some exchanges do not have means for obtaining a list of markets via their online API. For those, the list of markets is hardcoded.
- `loadMarkets ([reload])`: Returns the list of markets as an object indexed by symbol and caches it with the exchange instance. Returns cached markets if loaded already, unless the `reload = true` flag is forced.
- `fetchOrderBook (symbol[, params])`: Fetch L2/L3 order book for a particular market trading symbol.
- `fetchL2OrderBook (symbol[, params])`: Level 2 (price-aggregated) order book for a particular symbol.
- `fetchTrades (symbol[, since[, [limit, [params]]]])`: Fetch recent trades for a particular trading symbol.
Expand Down

0 comments on commit 6a9177c

Please sign in to comment.