Skip to content

Commit

Permalink
1.14.108
Browse files Browse the repository at this point in the history 
[ci skip]
  • Loading branch information
Travis CI committed May 31, 2018
1 parent 7369188 commit 5b28bcf
Show file tree
Hide file tree
Showing 11 changed files with 81 additions and 81 deletions.
41 changes: 21 additions & 20 deletions build/ccxt.browser.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ccxt.js
View file
Expand Up @@ -37,7 +37,7 @@ const Exchange = require ('./js/base/Exchange')
//-----------------------------------------------------------------------------
// this is updated by vss.js when building

const version = '1.14.107'
const version = '1.14.108'

Exchange.ccxtVersion = version

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
@@ -1,6 +1,6 @@
{
"name": "ccxt",
"version": "1.14.107",
"version": "1.14.108",
"description": "A JavaScript / Python / PHP cryptocurrency trading library with support for 100+ exchanges",
"main": "./ccxt.js",
"unpkg": "build/ccxt.browser.js",
Expand Down
2 changes: 1 addition & 1 deletion php/Exchange.php
View file
Expand Up @@ -30,7 +30,7 @@

namespace ccxt;

$version = '1.14.107';
$version = '1.14.108';

// rounding mode
const TRUNCATE = 0;
Expand Down
37 changes: 19 additions & 18 deletions php/btcturk.php
View file
Expand Up @@ -51,31 +51,32 @@ public function describe () {
),
),
'markets' => array (
'BTC/TRY' => array ( 'id' => 'BTCTRY', 'symbol' => 'BTC/TRY', 'base' => 'BTC', 'quote' => 'TRY', 'maker' => 0.002 * 1.18, 'taker' => 0.0035 * 1.18 ),
'ETH/TRY' => array ( 'id' => 'ETHTRY', 'symbol' => 'ETH/TRY', 'base' => 'ETH', 'quote' => 'TRY', 'maker' => 0.002 * 1.18, 'taker' => 0.0035 * 1.18 ),
'XRP/TRY' => array ( 'id' => 'XRPTRY', 'symbol' => 'XRP/TRY', 'base' => 'XRP', 'quote' => 'TRY', 'maker' => 0.002 * 1.18, 'taker' => 0.0035 * 1.18 ),
'ETH/BTC' => array ( 'id' => 'ETHBTC', 'symbol' => 'ETH/BTC', 'base' => 'ETH', 'quote' => 'BTC', 'maker' => 0.002 * 1.18, 'taker' => 0.0035 * 1.18 ),
'BTC/TRY' => array ( 'id' => 'BTCTRY', 'symbol' => 'BTC/TRY', 'base' => 'BTC', 'quote' => 'TRY', 'baseId' => 'btc', 'quoteId' => 'try', 'maker' => 0.002 * 1.18, 'taker' => 0.0035 * 1.18 ),
'ETH/TRY' => array ( 'id' => 'ETHTRY', 'symbol' => 'ETH/TRY', 'base' => 'ETH', 'quote' => 'TRY', 'baseId' => 'eth', 'quoteId' => 'try', 'maker' => 0.002 * 1.18, 'taker' => 0.0035 * 1.18 ),
'XRP/TRY' => array ( 'id' => 'XRPTRY', 'symbol' => 'XRP/TRY', 'base' => 'XRP', 'quote' => 'TRY', 'baseId' => 'xrp', 'quoteId' => 'try', 'maker' => 0.002 * 1.18, 'taker' => 0.0035 * 1.18 ),
'ETH/BTC' => array ( 'id' => 'ETHBTC', 'symbol' => 'ETH/BTC', 'base' => 'ETH', 'quote' => 'BTC', 'baseId' => 'eth', 'quoteId' => 'btc', 'maker' => 0.002 * 1.18, 'taker' => 0.0035 * 1.18 ),
),
));
}

public function fetch_balance ($params = array ()) {
$response = $this->privateGetBalance ();
$result = array ( 'info' => $response );
$base = array (
'free' => $response['bitcoin_available'],
'used' => $response['bitcoin_reserved'],
'total' => $response['bitcoin_balance'],
);
$quote = array (
'free' => $response['money_available'],
'used' => $response['money_reserved'],
'total' => $response['money_balance'],
);
$symbol = $this->symbols[0];
$market = $this->markets[$symbol];
$result[$market['base']] = $base;
$result[$market['quote']] = $quote;
$codes = is_array ($this->currencies) ? array_keys ($this->currencies) : array ();
for ($i = 0; $i < count ($codes); $i++) {
$code = $codes[$i];
$currency = $this->currencies[$code];
$account = $this->account ();
$free = $currency['id'] . '_available';
$total = $currency['id'] . '_balance';
$used = $currency['id'] . '_reserved';
if (is_array ($response) && array_key_exists ($free, $response)) {
$account['free'] = $this->safe_float($response, $free);
$account['total'] = $this->safe_float($response, $total);
$account['used'] = $this->safe_float($response, $used);
}
$result[$code] = $account;
}
return $this->parse_balance($result);
}

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

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

__version__ = '1.14.107'
__version__ = '1.14.108'

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

Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/async/__init__.py
View file
Expand Up @@ -4,7 +4,7 @@

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

__version__ = '1.14.107'
__version__ = '1.14.108'

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

Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/async/base/exchange.py
View file
Expand Up @@ -2,7 +2,7 @@

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

__version__ = '1.14.107'
__version__ = '1.14.108'

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

Expand Down
35 changes: 17 additions & 18 deletions python/ccxt/async/btcturk.py
View file
Expand Up @@ -53,30 +53,29 @@ def describe(self):
},
},
'markets': {
'BTC/TRY': {'id': 'BTCTRY', 'symbol': 'BTC/TRY', 'base': 'BTC', 'quote': 'TRY', 'maker': 0.002 * 1.18, 'taker': 0.0035 * 1.18},
'ETH/TRY': {'id': 'ETHTRY', 'symbol': 'ETH/TRY', 'base': 'ETH', 'quote': 'TRY', 'maker': 0.002 * 1.18, 'taker': 0.0035 * 1.18},
'XRP/TRY': {'id': 'XRPTRY', 'symbol': 'XRP/TRY', 'base': 'XRP', 'quote': 'TRY', 'maker': 0.002 * 1.18, 'taker': 0.0035 * 1.18},
'ETH/BTC': {'id': 'ETHBTC', 'symbol': 'ETH/BTC', 'base': 'ETH', 'quote': 'BTC', 'maker': 0.002 * 1.18, 'taker': 0.0035 * 1.18},
'BTC/TRY': {'id': 'BTCTRY', 'symbol': 'BTC/TRY', 'base': 'BTC', 'quote': 'TRY', 'baseId': 'btc', 'quoteId': 'try', 'maker': 0.002 * 1.18, 'taker': 0.0035 * 1.18},
'ETH/TRY': {'id': 'ETHTRY', 'symbol': 'ETH/TRY', 'base': 'ETH', 'quote': 'TRY', 'baseId': 'eth', 'quoteId': 'try', 'maker': 0.002 * 1.18, 'taker': 0.0035 * 1.18},
'XRP/TRY': {'id': 'XRPTRY', 'symbol': 'XRP/TRY', 'base': 'XRP', 'quote': 'TRY', 'baseId': 'xrp', 'quoteId': 'try', 'maker': 0.002 * 1.18, 'taker': 0.0035 * 1.18},
'ETH/BTC': {'id': 'ETHBTC', 'symbol': 'ETH/BTC', 'base': 'ETH', 'quote': 'BTC', 'baseId': 'eth', 'quoteId': 'btc', 'maker': 0.002 * 1.18, 'taker': 0.0035 * 1.18},
},
})

async def fetch_balance(self, params={}):
response = await self.privateGetBalance()
result = {'info': response}
base = {
'free': response['bitcoin_available'],
'used': response['bitcoin_reserved'],
'total': response['bitcoin_balance'],
}
quote = {
'free': response['money_available'],
'used': response['money_reserved'],
'total': response['money_balance'],
}
symbol = self.symbols[0]
market = self.markets[symbol]
result[market['base']] = base
result[market['quote']] = quote
codes = list(self.currencies.keys())
for i in range(0, len(codes)):
code = codes[i]
currency = self.currencies[code]
account = self.account()
free = currency['id'] + '_available'
total = currency['id'] + '_balance'
used = currency['id'] + '_reserved'
if free in response:
account['free'] = self.safe_float(response, free)
account['total'] = self.safe_float(response, total)
account['used'] = self.safe_float(response, used)
result[code] = account
return self.parse_balance(result)

async def fetch_order_book(self, symbol, limit=None, params={}):
Expand Down
2 changes: 1 addition & 1 deletion python/ccxt/base/exchange.py
View file
Expand Up @@ -4,7 +4,7 @@

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

__version__ = '1.14.107'
__version__ = '1.14.108'

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

Expand Down
35 changes: 17 additions & 18 deletions python/ccxt/btcturk.py
View file
Expand Up @@ -53,30 +53,29 @@ def describe(self):
},
},
'markets': {
'BTC/TRY': {'id': 'BTCTRY', 'symbol': 'BTC/TRY', 'base': 'BTC', 'quote': 'TRY', 'maker': 0.002 * 1.18, 'taker': 0.0035 * 1.18},
'ETH/TRY': {'id': 'ETHTRY', 'symbol': 'ETH/TRY', 'base': 'ETH', 'quote': 'TRY', 'maker': 0.002 * 1.18, 'taker': 0.0035 * 1.18},
'XRP/TRY': {'id': 'XRPTRY', 'symbol': 'XRP/TRY', 'base': 'XRP', 'quote': 'TRY', 'maker': 0.002 * 1.18, 'taker': 0.0035 * 1.18},
'ETH/BTC': {'id': 'ETHBTC', 'symbol': 'ETH/BTC', 'base': 'ETH', 'quote': 'BTC', 'maker': 0.002 * 1.18, 'taker': 0.0035 * 1.18},
'BTC/TRY': {'id': 'BTCTRY', 'symbol': 'BTC/TRY', 'base': 'BTC', 'quote': 'TRY', 'baseId': 'btc', 'quoteId': 'try', 'maker': 0.002 * 1.18, 'taker': 0.0035 * 1.18},
'ETH/TRY': {'id': 'ETHTRY', 'symbol': 'ETH/TRY', 'base': 'ETH', 'quote': 'TRY', 'baseId': 'eth', 'quoteId': 'try', 'maker': 0.002 * 1.18, 'taker': 0.0035 * 1.18},
'XRP/TRY': {'id': 'XRPTRY', 'symbol': 'XRP/TRY', 'base': 'XRP', 'quote': 'TRY', 'baseId': 'xrp', 'quoteId': 'try', 'maker': 0.002 * 1.18, 'taker': 0.0035 * 1.18},
'ETH/BTC': {'id': 'ETHBTC', 'symbol': 'ETH/BTC', 'base': 'ETH', 'quote': 'BTC', 'baseId': 'eth', 'quoteId': 'btc', 'maker': 0.002 * 1.18, 'taker': 0.0035 * 1.18},
},
})

def fetch_balance(self, params={}):
response = self.privateGetBalance()
result = {'info': response}
base = {
'free': response['bitcoin_available'],
'used': response['bitcoin_reserved'],
'total': response['bitcoin_balance'],
}
quote = {
'free': response['money_available'],
'used': response['money_reserved'],
'total': response['money_balance'],
}
symbol = self.symbols[0]
market = self.markets[symbol]
result[market['base']] = base
result[market['quote']] = quote
codes = list(self.currencies.keys())
for i in range(0, len(codes)):
code = codes[i]
currency = self.currencies[code]
account = self.account()
free = currency['id'] + '_available'
total = currency['id'] + '_balance'
used = currency['id'] + '_reserved'
if free in response:
account['free'] = self.safe_float(response, free)
account['total'] = self.safe_float(response, total)
account['used'] = self.safe_float(response, used)
result[code] = account
return self.parse_balance(result)

def fetch_order_book(self, symbol, limit=None, params={}):
Expand Down

0 comments on commit 5b28bcf

Please sign in to comment.