Skip to content

Commit

Permalink
1.10.1211
Browse files Browse the repository at this point in the history
[ci skip]
  • Loading branch information
Travis CI committed Feb 26, 2018
1 parent d205572 commit 4a60c72
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 21 deletions.
10 changes: 5 additions & 5 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.1210'
const version = '1.10.1211'

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

abstract class Exchange {

Expand Down
6 changes: 3 additions & 3 deletions php/bitmex.php
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ public function parse_ohlcv ($ohlcv, $market = null, $timeframe = '1m', $since =
];
}

public function fetch_ohlcv ($symbol, $timeframe = '1m', $since = null, $limit = null, $params = array ()) {
public function fetch_ohlcv ($symbol, $timeframe = '1m', $since = null, $limit = 100, $params = array ()) {
$this->load_markets();
// send JSON key/value pairs, such as array ("key" => "value")
// $filter by individual fields and do advanced queries on timestamps
Expand All @@ -321,19 +321,19 @@ public function fetch_ohlcv ($symbol, $timeframe = '1m', $since = null, $limit =
'symbol' => $market['id'],
'binSize' => $this->timeframes[$timeframe],
'partial' => true, // true == include yet-incomplete current bins
'count' => $limit, // default 100, max 500
// 'filter' => $filter, // $filter by individual fields and do advanced queries
// 'columns' => array (), // will return all columns if omitted
// 'start' => 0, // starting point for results (wtf?)
// 'reverse' => false, // true == newest first
// 'endTime' => '', // ending date $filter for results
);
// if $since is not set, they will return candles starting from 2017-01-01
if ($since !== null) {
$ymdhms = $this->ymdhms ($since);
$ymdhm = mb_substr ($ymdhms, 0, 16);
$request['startTime'] = $ymdhm; // starting date $filter for results
}
if ($limit !== null)
$request['count'] = $limit; // default 100
$response = $this->publicGetTradeBucketed (array_merge ($request, $params));
return $this->parse_ohlcvs($response, $market, $timeframe, $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.1210'
__version__ = '1.10.1211'

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

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.1210'
__version__ = '1.10.1211'

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

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.1210'
__version__ = '1.10.1211'

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

Expand Down
6 changes: 3 additions & 3 deletions python/ccxt/async/bitmex.py
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ def parse_ohlcv(self, ohlcv, market=None, timeframe='1m', since=None, limit=None
ohlcv['volume'],
]

async def fetch_ohlcv(self, symbol, timeframe='1m', since=None, limit=None, params={}):
async def fetch_ohlcv(self, symbol, timeframe='1m', since=None, limit=100, params={}):
await self.load_markets()
# send JSON key/value pairs, such as {"key": "value"}
# filter by individual fields and do advanced queries on timestamps
Expand All @@ -311,18 +311,18 @@ async def fetch_ohlcv(self, symbol, timeframe='1m', since=None, limit=None, para
'symbol': market['id'],
'binSize': self.timeframes[timeframe],
'partial': True, # True == include yet-incomplete current bins
'count': limit, # default 100, max 500
# 'filter': filter, # filter by individual fields and do advanced queries
# 'columns': [], # will return all columns if omitted
# 'start': 0, # starting point for results(wtf?)
# 'reverse': False, # True == newest first
# 'endTime': '', # ending date filter for results
}
# if since is not set, they will return candles starting from 2017-01-01
if since is not None:
ymdhms = self.ymdhms(since)
ymdhm = ymdhms[0:16]
request['startTime'] = ymdhm # starting date filter for results
if limit is not None:
request['count'] = limit # default 100
response = await self.publicGetTradeBucketed(self.extend(request, params))
return self.parse_ohlcvs(response, market, timeframe, since, limit)

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.1210'
__version__ = '1.10.1211'

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

Expand Down
6 changes: 3 additions & 3 deletions python/ccxt/bitmex.py
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ def parse_ohlcv(self, ohlcv, market=None, timeframe='1m', since=None, limit=None
ohlcv['volume'],
]

def fetch_ohlcv(self, symbol, timeframe='1m', since=None, limit=None, params={}):
def fetch_ohlcv(self, symbol, timeframe='1m', since=None, limit=100, params={}):
self.load_markets()
# send JSON key/value pairs, such as {"key": "value"}
# filter by individual fields and do advanced queries on timestamps
Expand All @@ -311,18 +311,18 @@ def fetch_ohlcv(self, symbol, timeframe='1m', since=None, limit=None, params={})
'symbol': market['id'],
'binSize': self.timeframes[timeframe],
'partial': True, # True == include yet-incomplete current bins
'count': limit, # default 100, max 500
# 'filter': filter, # filter by individual fields and do advanced queries
# 'columns': [], # will return all columns if omitted
# 'start': 0, # starting point for results(wtf?)
# 'reverse': False, # True == newest first
# 'endTime': '', # ending date filter for results
}
# if since is not set, they will return candles starting from 2017-01-01
if since is not None:
ymdhms = self.ymdhms(since)
ymdhm = ymdhms[0:16]
request['startTime'] = ymdhm # starting date filter for results
if limit is not None:
request['count'] = limit # default 100
response = self.publicGetTradeBucketed(self.extend(request, params))
return self.parse_ohlcvs(response, market, timeframe, since, limit)

Expand Down

0 comments on commit 4a60c72

Please sign in to comment.