Skip to content

Commit

Permalink
1.10.892
Browse files Browse the repository at this point in the history
[ci skip]
  • Loading branch information
Travis CI committed Jan 29, 2018
1 parent b484e62 commit d62262d
Show file tree
Hide file tree
Showing 11 changed files with 78 additions and 77 deletions.
114 changes: 54 additions & 60 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.891'
const version = '1.10.892'

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

abstract class Exchange {

Expand Down
11 changes: 7 additions & 4 deletions php/bitstamp.php
Original file line number Diff line number Diff line change
Expand Up @@ -338,11 +338,14 @@ public function fetch_order_status ($id, $symbol = null) {
public function fetch_my_trades ($symbol = null, $since = null, $limit = null, $params = array ()) {
$this->load_markets();
$market = null;
if ($symbol)
$request = array ();
$method = 'privatePostUserTransactions';
if ($symbol) {
$market = $this->market ($symbol);
$pair = $market ? $market['id'] : 'all';
$request = array_merge (array ( 'pair' => $pair ), $params);
$response = $this->privatePostUserTransactionsPair ($request);
$request['pair'] = $market['id'];
$method .= 'Pair';
}
$response = $this->$method (array_merge ($request, $params));
return $this->parse_trades($response, $market, $since, $limit);
}

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.891'
__version__ = '1.10.892'

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

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.891'
__version__ = '1.10.892'

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

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.891'
__version__ = '1.10.892'

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

Expand Down
8 changes: 5 additions & 3 deletions python/ccxt/async/bitstamp.py
Original file line number Diff line number Diff line change
Expand Up @@ -326,11 +326,13 @@ async def fetch_order_status(self, id, symbol=None):
async def fetch_my_trades(self, symbol=None, since=None, limit=None, params={}):
await self.load_markets()
market = None
request = {}
method = 'privatePostUserTransactions'
if symbol:
market = self.market(symbol)
pair = market['id'] if market else 'all'
request = self.extend({'pair': pair}, params)
response = await self.privatePostUserTransactionsPair(request)
request['pair'] = market['id']
method += 'Pair'
response = await getattr(self, method)(self.extend(request, params))
return self.parse_trades(response, market, since, limit)

async def fetch_order(self, id, symbol=None, params={}):
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.891'
__version__ = '1.10.892'

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

Expand Down
8 changes: 5 additions & 3 deletions python/ccxt/bitstamp.py
Original file line number Diff line number Diff line change
Expand Up @@ -326,11 +326,13 @@ def fetch_order_status(self, id, symbol=None):
def fetch_my_trades(self, symbol=None, since=None, limit=None, params={}):
self.load_markets()
market = None
request = {}
method = 'privatePostUserTransactions'
if symbol:
market = self.market(symbol)
pair = market['id'] if market else 'all'
request = self.extend({'pair': pair}, params)
response = self.privatePostUserTransactionsPair(request)
request['pair'] = market['id']
method += 'Pair'
response = getattr(self, method)(self.extend(request, params))
return self.parse_trades(response, market, since, limit)

def fetch_order(self, id, symbol=None, params={}):
Expand Down

0 comments on commit d62262d

Please sign in to comment.