Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ccxt-dev/ccxt
Browse files Browse the repository at this point in the history
  • Loading branch information
kroitor committed Oct 25, 2017
2 parents 296f95a + 946d95d commit a3d5165
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 13 deletions.
8 changes: 4 additions & 4 deletions build/ccxt.browser.js

Large diffs are not rendered by default.

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

$version = '1.9.255';
$version = '1.9.257';

$curl_errors = array (
0 => 'CURLE_OK',
Expand Down Expand Up @@ -5020,7 +5020,7 @@ public function sign ($path, $api = 'public', $method = 'GET', $params = array (
$headers = array (
'ACCESS-KEY' => $this->apiKey,
'ACCESS-TIMESTAMP' => $nonce,
'ACCESS-SIGN' => $this->hmac ($this->encode ($auth), $this->secret),
'ACCESS-SIGN' => $this->hmac ($this->encode ($auth), $this->encode ($this->secret)),
'Content-Type' => 'application/json',
);
}
Expand Down
4 changes: 2 additions & 2 deletions ccxt.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const CryptoJS = require ('crypto-js')
//-----------------------------------------------------------------------------
// this is updated by vss.js when building

const version = '1.9.255'
const version = '1.9.257'

//-----------------------------------------------------------------------------
// platform detection
Expand Down Expand Up @@ -1032,7 +1032,7 @@ const Exchange = function (config) {
}

this.amountToPrecision = function (symbol, amount) {
return parseFloat (amount).toFixed (this.markets[symbol].precision.amount)
return this.truncate(amount, this.markets[symbol].precision.amount)
}

this.feeToPrecision = function (symbol, fee) {
Expand Down
2 changes: 1 addition & 1 deletion ccxt.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class DDoSProtection extends NetworkError {}
class RequestTimeout extends NetworkError {}
class ExchangeNotAvailable extends NetworkError {}

$version = '1.9.255';
$version = '1.9.257';

$curl_errors = array (
0 => 'CURLE_OK',
Expand Down
2 changes: 1 addition & 1 deletion ccxt/async/exchanges.py

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

2 changes: 1 addition & 1 deletion ccxt/exchanges.py
Original file line number Diff line number Diff line change
Expand Up @@ -3608,7 +3608,7 @@ def sign(self, path, api='public', method='GET', params={}, headers=None, body=N
headers = {
'ACCESS-KEY': self.apiKey,
'ACCESS-TIMESTAMP': nonce,
'ACCESS-SIGN': self.hmac(self.encode(auth), self.secret),
'ACCESS-SIGN': self.hmac(self.encode(auth), self.encode(self.secret)),
'Content-Type': 'application/json',
}
return {'url': url, 'method': method, 'body': body, 'headers': headers}
Expand Down
2 changes: 1 addition & 1 deletion ccxt/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
SOFTWARE.
"""

__version__ = '1.9.255'
__version__ = '1.9.257'
6 changes: 6 additions & 0 deletions doc/exchanges.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ Supported Exchanges
Supported Exchanges
===================

Supported Exchanges
===================

Supported Exchanges
===================

The ccxt library currently supports the following 91 cryptocurrency exchange markets and trading APIs:

+------------------------+----------------------+----------------------------------------------------------------+-------+--------------------------------------------------------------------------------------------------+--------------------------------------------+
Expand Down
6 changes: 6 additions & 0 deletions doc/manual.rst
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@ Supported Exchanges
Supported Exchanges
===================

Supported Exchanges
===================

Supported Exchanges
===================

The ccxt library currently supports the following 91 cryptocurrency exchange markets and trading APIs:

+------------------------+----------------------+----------------------------------------------------------------+-------+--------------------------------------------------------------------------------------------------+--------------------------------------------+
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.9.255",
"version": "1.9.257",
"description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 90+ exchanges",
"main": "./ccxt.js",
"unpkg": "build/ccxt.browser.js",
Expand Down

0 comments on commit a3d5165

Please sign in to comment.