From dd9a21d40a399beab221b73c9568245845382b6c Mon Sep 17 00:00:00 2001 From: farukuzun Date: Thu, 31 May 2018 19:21:58 +0300 Subject: [PATCH 1/2] btcturk endpoits -> fetchBalance. Fixes #3003 --- js/btcturk.js | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/js/btcturk.js b/js/btcturk.js index 3cd2b6f8f396..58b07cf607cb 100644 --- a/js/btcturk.js +++ b/js/btcturk.js @@ -61,20 +61,19 @@ module.exports = class btcturk extends Exchange { async fetchBalance (params = {}) { let response = await this.privateGetBalance (); let result = { 'info': response }; - let base = { - 'free': response['bitcoin_available'], - 'used': response['bitcoin_reserved'], - 'total': response['bitcoin_balance'], - }; - let quote = { - 'free': response['money_available'], - 'used': response['money_reserved'], - 'total': response['money_balance'], - }; - let symbol = this.symbols[0]; - let market = this.markets[symbol]; - result[market['base']] = base; - result[market['quote']] = quote; + let currencies = Object.keys (this.currencies); + for (let i = 0; i < currencies.length; i++) { + let currency = currencies[i]; + let currency_lowercase = currency.toLowerCase (); + let account = this.account (); + let available = currency_lowercase + '_available'; + if (available in response) { + account['free'] = response[available]; + account['total'] = response[currency_lowercase + '_balance']; + account['used'] = response[currency_lowercase + '_reserved']; + } + result[currency] = account; + } return this.parseBalance (result); } From 2ec41cdbb3aa2effa00fae76b0c0ed0d2769c219 Mon Sep 17 00:00:00 2001 From: Igor Kroitor Date: Thu, 31 May 2018 22:48:29 +0300 Subject: [PATCH 2/2] btcturk merge #3004 fix #3003 --- js/btcturk.js | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/js/btcturk.js b/js/btcturk.js index 58b07cf607cb..1ac3700bb22a 100644 --- a/js/btcturk.js +++ b/js/btcturk.js @@ -50,10 +50,10 @@ module.exports = class btcturk extends Exchange { }, }, '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 }, }, }); } @@ -61,18 +61,20 @@ module.exports = class btcturk extends Exchange { async fetchBalance (params = {}) { let response = await this.privateGetBalance (); let result = { 'info': response }; - let currencies = Object.keys (this.currencies); - for (let i = 0; i < currencies.length; i++) { - let currency = currencies[i]; - let currency_lowercase = currency.toLowerCase (); + let codes = Object.keys (this.currencies); + for (let i = 0; i < codes.length; i++) { + let code = codes[i]; + let currency = this.currencies[code]; let account = this.account (); - let available = currency_lowercase + '_available'; - if (available in response) { - account['free'] = response[available]; - account['total'] = response[currency_lowercase + '_balance']; - account['used'] = response[currency_lowercase + '_reserved']; + let free = currency['id'] + '_available'; + let total = currency['id'] + '_balance'; + let used = currency['id'] + '_reserved'; + if (free in response) { + account['free'] = this.safeFloat (response, free); + account['total'] = this.safeFloat (response, total); + account['used'] = this.safeFloat (response, used); } - result[currency] = account; + result[code] = account; } return this.parseBalance (result); }