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 11, 2018
2 parents 613fc90 + be40d6c commit 640e83f
Show file tree
Hide file tree
Showing 11 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 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.129'
const version = '1.13.130'

Exchange.ccxtVersion = version

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.129",
"version": "1.13.130",
"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.129';
$version = '1.13.130';

// rounding mode
const TRUNCATE = 0;
Expand Down
2 changes: 1 addition & 1 deletion php/kraken.php
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@ public function fetch_closed_orders ($symbol = null, $since = null, $limit = nul
if ($since !== null)
$request['start'] = intval ($since / 1000);
$response = $this->privatePostClosedOrders (array_merge ($request, $params));
$orders = $this->parse_orders($response['result']['open'], null, $since, $limit);
$orders = $this->parse_orders($response['result']['closed'], null, $since, $limit);
if ($symbol === null)
return $orders;
return $this->filter_by_symbol($orders, $symbol);
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.129'
__version__ = '1.13.130'

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

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.129'
__version__ = '1.13.130'

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

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.129'
__version__ = '1.13.130'

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

Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/async/kraken.py
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@ async def fetch_closed_orders(self, symbol=None, since=None, limit=None, params=
if since is not None:
request['start'] = int(since / 1000)
response = await self.privatePostClosedOrders(self.extend(request, params))
orders = self.parse_orders(response['result']['open'], None, since, limit)
orders = self.parse_orders(response['result']['closed'], None, since, limit)
if symbol is None:
return orders
return self.filter_by_symbol(orders, symbol)
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.129'
__version__ = '1.13.130'

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

Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/kraken.py
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@ def fetch_closed_orders(self, symbol=None, since=None, limit=None, params={}):
if since is not None:
request['start'] = int(since / 1000)
response = self.privatePostClosedOrders(self.extend(request, params))
orders = self.parse_orders(response['result']['open'], None, since, limit)
orders = self.parse_orders(response['result']['closed'], None, since, limit)
if symbol is None:
return orders
return self.filter_by_symbol(orders, symbol)
Expand Down

0 comments on commit 640e83f

Please sign in to comment.