Skip to content

Commit

Permalink
1.25.22
Browse files Browse the repository at this point in the history 
[ci skip]
  • Loading branch information
Travis CI committed Mar 26, 2020
1 parent 06d7d7e commit 8d5d3f6
Show file tree
Hide file tree
Showing 42 changed files with 182 additions and 26 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,13 +219,13 @@ console.log (ccxt.exchanges) // print all available exchanges

All-in-one browser bundle (dependencies included), served from a CDN of your choice:

* jsDelivr: https://cdn.jsdelivr.net/npm/[email protected].21/dist/ccxt.browser.js
* unpkg: https://unpkg.com/[email protected].21/dist/ccxt.browser.js
* jsDelivr: https://cdn.jsdelivr.net/npm/[email protected].22/dist/ccxt.browser.js
* unpkg: https://unpkg.com/[email protected].22/dist/ccxt.browser.js

CDNs are not updated in real-time and may have delays. Defaulting to the most recent version without specifying the version number is not recommended. Please, keep in mind that we are not responsible for the correct operation of those CDN servers.

```HTML
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].21/dist/ccxt.browser.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].22/dist/ccxt.browser.js"></script>
```

Creates a global `ccxt` object:
Expand Down
2 changes: 1 addition & 1 deletion ccxt.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const Exchange = require ('./js/base/Exchange')
//-----------------------------------------------------------------------------
// this is updated by vss.js when building

const version = '1.25.21'
const version = '1.25.22'

Exchange.ccxtVersion = version

Expand Down
41 changes: 40 additions & 1 deletion dist/ccxt.browser.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const Exchange = require ('./js/base/Exchange')
//-----------------------------------------------------------------------------
// this is updated by vss.js when building

const version = '1.25.21'
const version = '1.25.22'

Exchange.ccxtVersion = version

Expand Down Expand Up @@ -45615,6 +45615,7 @@ module.exports = class coss extends Exchange {
return {
'info': order,
'id': id,
'clientOrderId': undefined,
'timestamp': timestamp,
'datetime': this.iso8601 (timestamp),
'lastTradeTimestamp': undefined,
Expand Down Expand Up @@ -46432,6 +46433,7 @@ module.exports = class crex24 extends Exchange {
return {
'info': order,
'id': id,
'clientOrderId': undefined,
'timestamp': timestamp,
'datetime': this.iso8601 (timestamp),
'lastTradeTimestamp': lastTradeTimestamp,
Expand Down Expand Up @@ -48137,6 +48139,7 @@ module.exports = class deribit extends Exchange {
return {
'info': order,
'id': id,
'clientOrderId': undefined,
'timestamp': timestamp,
'datetime': this.iso8601 (timestamp),
'lastTradeTimestamp': lastTradeTimestamp,
Expand Down Expand Up @@ -49595,6 +49598,7 @@ module.exports = class digifinex extends Exchange {
return {
'info': order,
'id': id,
'clientOrderId': undefined,
'timestamp': timestamp,
'datetime': this.iso8601 (timestamp),
'lastTradeTimestamp': lastTradeTimestamp,
Expand Down Expand Up @@ -50748,6 +50752,7 @@ module.exports = class dsx extends Exchange {
return {
'info': order,
'id': id,
'clientOrderId': undefined,
'symbol': symbol,
'timestamp': timestamp,
'datetime': this.iso8601 (timestamp),
Expand Down Expand Up @@ -52356,6 +52361,7 @@ module.exports = class exmo extends Exchange {
};
return {
'id': id,
'clientOrderId': undefined,
'datetime': this.iso8601 (timestamp),
'timestamp': timestamp,
'lastTradeTimestamp': lastTradeTimestamp,
Expand Down Expand Up @@ -52907,6 +52913,20 @@ module.exports = class exx extends Exchange {
}

parseOrder (order, market = undefined) {
//
// {
// "fees": 0,
// "total_amount": 1,
// "trade_amount": 0,
// "price": 30,
// "currency": “eth_hsr",
// "id": "13878",
// "trade_money": 0,
// "type": "buy",
// "trade_date": 1509728897772,
// "status": 0
// }
//
const symbol = market['symbol'];
const timestamp = parseInt (order['trade_date']);
const price = this.safeFloat (order, 'price');
Expand All @@ -52931,6 +52951,7 @@ module.exports = class exx extends Exchange {
}
return {
'id': this.safeString (order, 'id'),
'clientOrderId': undefined,
'datetime': this.iso8601 (timestamp),
'timestamp': timestamp,
'lastTradeTimestamp': undefined,
Expand Down Expand Up @@ -53586,6 +53607,22 @@ module.exports = class fcoin extends Exchange {
}

parseOrder (order, market = undefined) {
//
// {
// "id": "string",
// "symbol": "string",
// "type": "limit",
// "side": "buy",
// "price": "string",
// "amount": "string",
// "state": "submitted",
// "executed_value": "string",
// "fill_fees": "string",
// "filled_amount": "string",
// "created_at": 0,
// "source": "web"
// }
//
const id = this.safeString (order, 'id');
const side = this.safeString (order, 'side');
const status = this.parseOrderStatus (this.safeString (order, 'state'));
Expand Down Expand Up @@ -53634,6 +53671,7 @@ module.exports = class fcoin extends Exchange {
return {
'info': order,
'id': id,
'clientOrderId': undefined,
'timestamp': timestamp,
'datetime': this.iso8601 (timestamp),
'lastTradeTimestamp': undefined,
Expand Down Expand Up @@ -56515,6 +56553,7 @@ module.exports = class gateio extends Exchange {
}
return {
'id': id,
'clientOrderId': undefined,
'datetime': this.iso8601 (timestamp),
'timestamp': timestamp,
'lastTradeTimestamp': lastTradeTimestamp,
Expand Down
6 changes: 3 additions & 3 deletions doc/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,14 +358,14 @@ JavaScript (for use with the ``<script>`` tag):

All-in-one browser bundle (dependencies included), served from a CDN of your choice:

- jsDelivr: https://cdn.jsdelivr.net/npm/[email protected].21/dist/ccxt.browser.js
- unpkg: https://unpkg.com/[email protected].21/dist/ccxt.browser.js
- jsDelivr: https://cdn.jsdelivr.net/npm/[email protected].22/dist/ccxt.browser.js
- unpkg: https://unpkg.com/[email protected].22/dist/ccxt.browser.js

CDNs are not updated in real-time and may have delays. Defaulting to the most recent version without specifying the version number is not recommended. Please, keep in mind that we are not responsible for the correct operation of those CDN servers.

.. code:: html

<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].21/dist/ccxt.browser.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].22/dist/ccxt.browser.js"></script>

Creates a global ``ccxt`` object:

Expand Down
6 changes: 3 additions & 3 deletions doc/install.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ JavaScript (for use with the ``<script>`` tag):

All-in-one browser bundle (dependencies included), served from a CDN of your choice:

- jsDelivr: https://cdn.jsdelivr.net/npm/[email protected].21/dist/ccxt.browser.js
- unpkg: https://unpkg.com/[email protected].21/dist/ccxt.browser.js
- jsDelivr: https://cdn.jsdelivr.net/npm/[email protected].22/dist/ccxt.browser.js
- unpkg: https://unpkg.com/[email protected].22/dist/ccxt.browser.js

You can obtain a live-updated version of the bundle by removing the version number from the URL (the ``@a.b.c`` thing) — however, we do not recommend to do that, as it may break your app eventually. Also, please keep in mind that we are not responsible for the correct operation of those CDN servers.

.. code:: html

<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].21/dist/ccxt.browser.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].22/dist/ccxt.browser.js"></script>

Creates a global ``ccxt`` object:

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ccxt",
"version": "1.25.21",
"version": "1.25.22",
"description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 130+ exchanges",
"main": "./ccxt.js",
"unpkg": "dist/ccxt.browser.js",
Expand Down
4 changes: 2 additions & 2 deletions php/base/Exchange.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
use Elliptic\EC;
use BN\BN;

$version = '1.25.21';
$version = '1.25.22';

// rounding mode
const TRUNCATE = 0;
Expand All @@ -54,7 +54,7 @@

class Exchange {

const VERSION = '1.25.21';
const VERSION = '1.25.22';

public static $exchanges = array(
'_1btcxe',
Expand Down
1 change: 1 addition & 0 deletions php/coss.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -835,6 +835,7 @@ public function parse_order($order, $market = null) {
return array(
'info' => $order,
'id' => $id,
'clientOrderId' => null,
'timestamp' => $timestamp,
'datetime' => $this->iso8601($timestamp),
'lastTradeTimestamp' => null,
Expand Down
1 change: 1 addition & 0 deletions php/crex24.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -715,6 +715,7 @@ public function parse_order($order, $market = null) {
return array(
'info' => $order,
'id' => $id,
'clientOrderId' => null,
'timestamp' => $timestamp,
'datetime' => $this->iso8601($timestamp),
'lastTradeTimestamp' => $lastTradeTimestamp,
Expand Down
1 change: 1 addition & 0 deletions php/deribit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1110,6 +1110,7 @@ public function parse_order($order, $market = null) {
return array(
'info' => $order,
'id' => $id,
'clientOrderId' => null,
'timestamp' => $timestamp,
'datetime' => $this->iso8601($timestamp),
'lastTradeTimestamp' => $lastTradeTimestamp,
Expand Down
1 change: 1 addition & 0 deletions php/digifinex.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,7 @@ public function parse_order($order, $market = null) {
return array(
'info' => $order,
'id' => $id,
'clientOrderId' => null,
'timestamp' => $timestamp,
'datetime' => $this->iso8601($timestamp),
'lastTradeTimestamp' => $lastTradeTimestamp,
Expand Down
1 change: 1 addition & 0 deletions php/dsx.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,7 @@ public function parse_order($order, $market = null) {
return array(
'info' => $order,
'id' => $id,
'clientOrderId' => null,
'symbol' => $symbol,
'timestamp' => $timestamp,
'datetime' => $this->iso8601($timestamp),
Expand Down
1 change: 1 addition & 0 deletions php/exmo.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1171,6 +1171,7 @@ public function parse_order($order, $market = null) {
);
return array(
'id' => $id,
'clientOrderId' => null,
'datetime' => $this->iso8601($timestamp),
'timestamp' => $timestamp,
'lastTradeTimestamp' => $lastTradeTimestamp,
Expand Down
15 changes: 15 additions & 0 deletions php/exx.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,20 @@ public function fetch_balance($params = array ()) {
}

public function parse_order($order, $market = null) {
//
// {
// "fees" => 0,
// "total_amount" => 1,
// "trade_amount" => 0,
// "$price" => 30,
// "currency" => “eth_hsr",
// "id" => "13878",
// "trade_money" => 0,
// "type" => "buy",
// "trade_date" => 1509728897772,
// "$status" => 0
// }
//
$symbol = $market['symbol'];
$timestamp = intval ($order['trade_date']);
$price = $this->safe_float($order, 'price');
Expand All @@ -299,6 +313,7 @@ public function parse_order($order, $market = null) {
}
return array(
'id' => $this->safe_string($order, 'id'),
'clientOrderId' => null,
'datetime' => $this->iso8601($timestamp),
'timestamp' => $timestamp,
'lastTradeTimestamp' => null,
Expand Down
17 changes: 17 additions & 0 deletions php/fcoin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,22 @@ public function parse_order_status($status) {
}

public function parse_order($order, $market = null) {
//
// {
// "$id" => "string",
// "$symbol" => "string",
// "type" => "limit",
// "$side" => "buy",
// "$price" => "string",
// "$amount" => "string",
// "state" => "submitted",
// "executed_value" => "string",
// "fill_fees" => "string",
// "filled_amount" => "string",
// "created_at" => 0,
// "source" => "web"
// }
//
$id = $this->safe_string($order, 'id');
$side = $this->safe_string($order, 'side');
$status = $this->parse_order_status($this->safe_string($order, 'state'));
Expand Down Expand Up @@ -566,6 +582,7 @@ public function parse_order($order, $market = null) {
return array(
'info' => $order,
'id' => $id,
'clientOrderId' => null,
'timestamp' => $timestamp,
'datetime' => $this->iso8601($timestamp),
'lastTradeTimestamp' => null,
Expand Down
1 change: 1 addition & 0 deletions php/gateio.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,7 @@ public function parse_order($order, $market = null) {
}
return array(
'id' => $id,
'clientOrderId' => null,
'datetime' => $this->iso8601($timestamp),
'timestamp' => $timestamp,
'lastTradeTimestamp' => $lastTradeTimestamp,
Expand Down
6 changes: 3 additions & 3 deletions python/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,14 +358,14 @@ JavaScript (for use with the ``<script>`` tag):

All-in-one browser bundle (dependencies included), served from a CDN of your choice:

- jsDelivr: https://cdn.jsdelivr.net/npm/[email protected].21/dist/ccxt.browser.js
- unpkg: https://unpkg.com/[email protected].21/dist/ccxt.browser.js
- jsDelivr: https://cdn.jsdelivr.net/npm/[email protected].22/dist/ccxt.browser.js
- unpkg: https://unpkg.com/[email protected].22/dist/ccxt.browser.js

CDNs are not updated in real-time and may have delays. Defaulting to the most recent version without specifying the version number is not recommended. Please, keep in mind that we are not responsible for the correct operation of those CDN servers.

.. code:: html

<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].21/dist/ccxt.browser.js"></script>
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected].22/dist/ccxt.browser.js"></script>

Creates a global ``ccxt`` object:

Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

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

__version__ = '1.25.21'
__version__ = '1.25.22'

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

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

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

__version__ = '1.25.21'
__version__ = '1.25.22'

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

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

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

__version__ = '1.25.21'
__version__ = '1.25.22'

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

Expand Down
1 change: 1 addition & 0 deletions python/ccxt/async_support/coss.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -783,6 +783,7 @@ def parse_order(self, order, market=None):
return {
'info': order,
'id': id,
'clientOrderId': None,
'timestamp': timestamp,
'datetime': self.iso8601(timestamp),
'lastTradeTimestamp': None,
Expand Down
1 change: 1 addition & 0 deletions python/ccxt/async_support/crex24.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -677,6 +677,7 @@ def parse_order(self, order, market=None):
return {
'info': order,
'id': id,
'clientOrderId': None,
'timestamp': timestamp,
'datetime': self.iso8601(timestamp),
'lastTradeTimestamp': lastTradeTimestamp,
Expand Down
Loading

0 comments on commit 8d5d3f6

Please sign in to comment.