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 May 14, 2018
2 parents 7408b4f + e2d0139 commit 137db36
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 10 deletions.
4 changes: 2 additions & 2 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 Exchange = require ('./js/base/Exchange')
//-----------------------------------------------------------------------------
// this is updated by vss.js when building

const version = '1.13.143'
const version = '1.13.144'

Exchange.ccxtVersion = version

Expand Down
19 changes: 18 additions & 1 deletion doc/manual.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2816,7 +2816,7 @@ For example, if you want to print recent trades for all symbols one by one seque
var_dump ($exchange->fetch_trades ($symbol));
}

The fetchTrades method shown above returns an ordered list of trades (a flat array, sorted by timestamp in ascending order, most recent trade last) represented by the following structure:
The fetchTrades method shown above returns an ordered list of trades (a flat array, sorted by timestamp in ascending order, oldest trade first, most recent trade last). A list of trades is represented by the following structure:

.. code:: javascript

Expand All @@ -2840,6 +2840,8 @@ Most exchanges return most of the above fields for each trade, though there are

The second optional argument ``since`` reduces the array by timestamp, the third ``limit`` argument reduces by number (count) of returned items.

If the user does not specify ``since``, the ``fetchTrades`` method will return the default range of public trades from the exchange. The default set is exchange-specific, some exchanges will return trades starting from the date of listing a pair on the exchange, other exchanges will return a reduced set of trades (like, last 24 hours, last 100 trades, etc). If the user wants precise control over the timeframe, the user is responsible for specifying the ``since`` argument.

The ``fetchTrades ()`` / ``fetch_trades()`` method also accepts an optional ``params`` (assoc-key array/dict, empty by default) as its fourth argument. You can use it to pass extra params to method calls or to override a particular default value (where supported by the exchange). See the API docs for your exchange for more details.

::
Expand Down Expand Up @@ -3176,6 +3178,21 @@ Below are examples of using the fetchOrder method to get order info from an auth
var_dump ($order);
}

Querying Multiple Orders
^^^^^^^^^^^^^^^^^^^^^^^^

All methods returning lists of trades and lists of orders, accept the second ``since`` argument and the third ``limit`` argument:

- ``fetchTrades`` (public)
- ``fetchMyTrades`` (private)
- ``fetchOrders``
- ``fetchOpenOrders``
- ``fetchClosedOrders``

The second argument ``since`` reduces the array by timestamp, the third ``limit`` argument reduces by number (count) of returned items.

If the user does not specify ``since``, the ``fetchTrades/fetchOrders`` method will return the default set from the exchange. The default set is exchange-specific, some exchanges will return trades or recent orders starting from the date of listing a pair on the exchange, other exchanges will return a reduced set of trades or orders (like, last 24 hours, last 100 trades, first 100 orders, etc). If the user wants precise control over the timeframe, the user is responsible for specifying the ``since`` argument.

All Orders
^^^^^^^^^^

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.13.143",
"version": "1.13.144",
"description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 100+ 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.13.143';
$version = '1.13.144';

// rounding mode
const TRUNCATE = 0;
Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

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

__version__ = '1.13.143'
__version__ = '1.13.144'

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

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.13.143'
__version__ = '1.13.144'

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

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.13.143'
__version__ = '1.13.144'

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

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.13.143'
__version__ = '1.13.144'

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

Expand Down

0 comments on commit 137db36

Please sign in to comment.