Skip to content

Commit

Permalink
1.10.1191
Browse files Browse the repository at this point in the history
[ci skip]
  • Loading branch information
Travis CI committed Feb 25, 2018
1 parent ceac118 commit 8ee74c6
Show file tree
Hide file tree
Showing 11 changed files with 57 additions and 9 deletions.
17 changes: 15 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.10.1190'
const version = '1.10.1191'

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.10.1190",
"version": "1.10.1191",
"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.1190';
$version = '1.10.1191';

abstract class Exchange {

Expand Down
13 changes: 13 additions & 0 deletions php/exmo.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public function describe () {
'CORS' => false,
'fetchOrder' => true,
'fetchOpenOrders' => true,
'fetchOrderTrades' => true,
'fetchOrderBooks' => true,
'fetchMyTrades' => true,
'fetchTickers' => true,
Expand Down Expand Up @@ -316,6 +317,18 @@ public function fetch_order ($id, $symbol = null, $params = array ()) {
return $this->parse_order($response, $market);
}

public function fetch_order_trades ($id, $symbol = null, $since = null, $limit = null, $params = array ()) {
$market = null;
if ($symbol !== null) {
$this->load_markets();
$market = $this->market ($symbol);
}
$response = $this->privatePostOrderTrades (array_merge (array (
'order_id' => $id,
), $params));
return $this->parse_trades($response['trades'], $market, $since, $limit);
}

public function fetch_open_orders ($symbol = null, $since = null, $limit = null, $params = array ()) {
$market = null;
if ($symbol !== null) {
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.1190'
__version__ = '1.10.1191'

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

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.1190'
__version__ = '1.10.1191'

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

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.1190'
__version__ = '1.10.1191'

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

Expand Down
11 changes: 11 additions & 0 deletions python/ccxt/async/exmo.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ def describe(self):
'CORS': False,
'fetchOrder': True,
'fetchOpenOrders': True,
'fetchOrderTrades': True,
'fetchOrderBooks': True,
'fetchMyTrades': True,
'fetchTickers': True,
Expand Down Expand Up @@ -297,6 +298,16 @@ async def fetch_order(self, id, symbol=None, params={}):
response = await self.privatePostOrderTrades(self.extend({'order_id': id}, params))
return self.parse_order(response, market)

async def fetch_order_trades(self, id, symbol=None, since=None, limit=None, params={}):
market = None
if symbol is not None:
await self.load_markets()
market = self.market(symbol)
response = await self.privatePostOrderTrades(self.extend({
'order_id': id,
}, params))
return self.parse_trades(response['trades'], market, since, limit)

async def fetch_open_orders(self, symbol=None, since=None, limit=None, params={}):
market = None
if symbol is not None:
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.1190'
__version__ = '1.10.1191'

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

Expand Down
11 changes: 11 additions & 0 deletions python/ccxt/exmo.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ def describe(self):
'CORS': False,
'fetchOrder': True,
'fetchOpenOrders': True,
'fetchOrderTrades': True,
'fetchOrderBooks': True,
'fetchMyTrades': True,
'fetchTickers': True,
Expand Down Expand Up @@ -297,6 +298,16 @@ def fetch_order(self, id, symbol=None, params={}):
response = self.privatePostOrderTrades(self.extend({'order_id': id}, params))
return self.parse_order(response, market)

def fetch_order_trades(self, id, symbol=None, since=None, limit=None, params={}):
market = None
if symbol is not None:
self.load_markets()
market = self.market(symbol)
response = self.privatePostOrderTrades(self.extend({
'order_id': id,
}, params))
return self.parse_trades(response['trades'], market, since, limit)

def fetch_open_orders(self, symbol=None, since=None, limit=None, params={}):
market = None
if symbol is not None:
Expand Down

0 comments on commit 8ee74c6

Please sign in to comment.