Skip to content

Commit

Permalink
1.10.902
Browse files Browse the repository at this point in the history
[ci skip]
Travis CI committed Jan 29, 2018

Unverified

This user has not yet uploaded their public signing key.
1 parent f2a6a2f commit 69d28f8
Showing 11 changed files with 33 additions and 21 deletions.
13 changes: 8 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
@@ -37,7 +37,7 @@ const Exchange = require ('./js/base/Exchange')
//-----------------------------------------------------------------------------
// this is updated by vss.js when building

const version = '1.10.901'
const version = '1.10.902'

Exchange.ccxtVersion = version

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.901",
"version": "1.10.902",
"description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 90+ exchanges",
"main": "./ccxt.js",
"unpkg": "build/ccxt.browser.js",
2 changes: 1 addition & 1 deletion php/Exchange.php
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@

namespace ccxt;

$version = '1.10.901';
$version = '1.10.902';

abstract class Exchange {

9 changes: 6 additions & 3 deletions php/gdax.php
Original file line number Diff line number Diff line change
@@ -241,11 +241,14 @@ public function fetch_ticker ($symbol, $params = array ()) {

public function parse_trade ($trade, $market = null) {
$timestamp = null;
if (isset($trade['time'])) {
if (is_array ($trade) && array_key_exists ('time', $trade)) {
$timestamp = $this->parse8601 ($trade['time']);
} else {
} else if (is_array ($trade) && array_key_exists ('created_at', $trade)) {
$timestamp = $this->parse8601 ($trade['created_at']);
}
$iso8601 = null;
if ($timestamp !== null)
$iso8601 = $this->iso8601 ($timestamp);
$side = ($trade['side'] === 'buy') ? 'sell' : 'buy';
$symbol = null;
if (!$market) {
@@ -278,7 +281,7 @@ public function parse_trade ($trade, $market = null) {
'order' => $orderId,
'info' => $trade,
'timestamp' => $timestamp,
'datetime' => $this->iso8601 ($timestamp),
'datetime' => $iso8601,
'symbol' => $symbol,
'type' => $type,
'side' => $side,
2 changes: 1 addition & 1 deletion python/ccxt/__init__.py
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@

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

__version__ = '1.10.901'
__version__ = '1.10.902'

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

2 changes: 1 addition & 1 deletion python/ccxt/async/__init__.py
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

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

__version__ = '1.10.901'
__version__ = '1.10.902'

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

2 changes: 1 addition & 1 deletion python/ccxt/async/base/exchange.py
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

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

__version__ = '1.10.901'
__version__ = '1.10.902'

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

9 changes: 6 additions & 3 deletions python/ccxt/async/gdax.py
Original file line number Diff line number Diff line change
@@ -242,10 +242,13 @@ async def fetch_ticker(self, symbol, params={}):

def parse_trade(self, trade, market=None):
timestamp = None
if trade['time']:
if 'time' in trade:
timestamp = self.parse8601(trade['time'])
else:
elif 'created_at' in trade:
timestamp = self.parse8601(trade['created_at'])
iso8601 = None
if timestamp is not None:
iso8601 = self.iso8601(timestamp)
side = 'sell' if (trade['side'] == 'buy') else 'buy'
symbol = None
if not market:
@@ -275,7 +278,7 @@ def parse_trade(self, trade, market=None):
'order': orderId,
'info': trade,
'timestamp': timestamp,
'datetime': self.iso8601(timestamp),
'datetime': iso8601,
'symbol': symbol,
'type': type,
'side': side,
2 changes: 1 addition & 1 deletion python/ccxt/base/exchange.py
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

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

__version__ = '1.10.901'
__version__ = '1.10.902'

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

9 changes: 6 additions & 3 deletions python/ccxt/gdax.py
Original file line number Diff line number Diff line change
@@ -242,10 +242,13 @@ def fetch_ticker(self, symbol, params={}):

def parse_trade(self, trade, market=None):
timestamp = None
if trade['time']:
if 'time' in trade:
timestamp = self.parse8601(trade['time'])
else:
elif 'created_at' in trade:
timestamp = self.parse8601(trade['created_at'])
iso8601 = None
if timestamp is not None:
iso8601 = self.iso8601(timestamp)
side = 'sell' if (trade['side'] == 'buy') else 'buy'
symbol = None
if not market:
@@ -275,7 +278,7 @@ def parse_trade(self, trade, market=None):
'order': orderId,
'info': trade,
'timestamp': timestamp,
'datetime': self.iso8601(timestamp),
'datetime': iso8601,
'symbol': symbol,
'type': type,
'side': side,

0 comments on commit 69d28f8

Please sign in to comment.