Skip to content

Commit

Permalink
1.4.31
Browse files Browse the repository at this point in the history
[ci skip]
  • Loading branch information
Travis CI committed Aug 19, 2017
1 parent f2a2792 commit 0c7c476
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 30 deletions.
16 changes: 9 additions & 7 deletions build/ccxt.browser.js

Large diffs are not rendered by default.

16 changes: 9 additions & 7 deletions build/ccxt.es5.js

Large diffs are not rendered by default.

11 changes: 5 additions & 6 deletions build/ccxt.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class DDoSProtection extends NetworkError {}
class RequestTimeout extends NetworkError {}
class ExchangeNotAvailable extends NetworkError {}

$version = '1.4.30';
$version = '1.4.31';

$curl_errors = array (
0 => 'CURLE_OK',
Expand Down Expand Up @@ -10350,9 +10350,6 @@ public function fetch_markets () {
$step = floatval ($market['step']);
$base = $this->commonCurrencyCode ($base);
$quote = $this->commonCurrencyCode ($quote);
// looks like they now have it correct
// if ($base == 'DSH')
// $base = 'DASH';
$symbol = $base . '/' . $quote;
$result[] = array (
'id' => $id,
Expand Down Expand Up @@ -10494,9 +10491,11 @@ public function create_order ($market, $type, $side, $amount, $price = null, $pa
);
}

public function cancel_order ($id) {
public function cancel_order ($id, $params = array ()) {
$this->loadMarkets ();
return $this->tradingPostCancelOrder (array ( 'clientOrderId' => $id ));
return $this->tradingPostCancelOrder (array_merge (array (
'clientOrderId' => $id,
), $params));
}

public function request ($path, $api = 'public', $method = 'GET', $params = array (), $headers = null, $body = null) {
Expand Down
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 CryptoJS = require ('crypto-js')
//-----------------------------------------------------------------------------
// this is updated by vss.js when building

const version = '1.4.30'
const version = '1.4.31'

//-----------------------------------------------------------------------------
// platform detection
Expand Down
2 changes: 1 addition & 1 deletion ccxt.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class DDoSProtection extends NetworkError {}
class RequestTimeout extends NetworkError {}
class ExchangeNotAvailable extends NetworkError {}

$version = '1.4.30';
$version = '1.4.31';

$curl_errors = array (
0 => 'CURLE_OK',
Expand Down
2 changes: 1 addition & 1 deletion ccxt.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@

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

__version__ = '1.4.30'
__version__ = '1.4.31'

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

Expand Down
11 changes: 5 additions & 6 deletions ccxt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@

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

__version__ = '1.4.30'
__version__ = '1.4.31'

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

Expand Down Expand Up @@ -9615,9 +9615,6 @@ def fetch_markets(self):
step = float(market['step'])
base = self.commonCurrencyCode(base)
quote = self.commonCurrencyCode(quote)
# looks like they now have it correct
# if base == 'DSH':
# base = 'DASH'
symbol = base + '/' + quote
result.append({
'id': id,
Expand Down Expand Up @@ -9746,9 +9743,11 @@ def create_order(self, market, type, side, amount, price=None, params={}):
'id': response['ExecutionReport']['orderId'],
}

def cancel_order(self, id):
def cancel_order(self, id, params={}):
self.loadMarkets()
return self.tradingPostCancelOrder({'clientOrderId': id})
return self.tradingPostCancelOrder(self.extend({
'clientOrderId': id,
}, params))

def request(self, path, api='public', method='GET', params={}, headers=None, body=None):
url = '/' + 'api' + '/' + self.version + '/' + api + '/' + self.implode_params(path, params)
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.4.30",
"version": "1.4.31",
"description": "A library for cryptocurrency trading and e-commerce with support for many bitcoin/ether/altcoin exchange markets and merchant APIs",
"main": "build/ccxt.es5.js",
"unpkg": "build/ccxt.browser.js",
Expand Down

0 comments on commit 0c7c476

Please sign in to comment.