From aa15f6c4b83930097272dbe0d94f0860fc30afb7 Mon Sep 17 00:00:00 2001 From: Miroslav Kovar Date: Thu, 21 Sep 2017 17:49:01 +0200 Subject: [PATCH 1/8] Added redundant market feed (cryptonator). --- lbrynet/daemon/ExchangeRateManager.py | 60 ++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 5 deletions(-) diff --git a/lbrynet/daemon/ExchangeRateManager.py b/lbrynet/daemon/ExchangeRateManager.py index 63298ed88..40020fa7c 100644 --- a/lbrynet/daemon/ExchangeRateManager.py +++ b/lbrynet/daemon/ExchangeRateManager.py @@ -45,14 +45,23 @@ class MarketFeed(object): self.fee = fee self.rate = None self._updater = LoopingCall(self._update_price) + self._online = True @property def rate_is_initialized(self): return self.rate is not None + @property + def is_online(self): + return self._online + def _make_request(self): r = requests.get(self.url, self.params, timeout=self.REQUESTS_TIMEOUT) - return r.text + if r.status_code == 200: + self._online = True + return r.text + self._online = False + return "" def _handle_response(self, response): return NotImplementedError @@ -66,7 +75,8 @@ class MarketFeed(object): self.rate = ExchangeRate(self.market, price, int(time.time())) def _log_error(self, err): - log.warning("There was a problem updating %s exchange rate information from %s\n%s", + log.warning( + "There was a problem updating %s exchange rate information from %s: %s", self.market, self.name, err) def _update_price(self): @@ -151,6 +161,45 @@ class LBRYioBTCFeed(MarketFeed): return defer.succeed(1.0 / json_response['data']['btc_usd']) +class CryptonatorBTCFeed(MarketFeed): + def __init__(self): + MarketFeed.__init__( + self, + "USDBTC", + "cryptonator.com", + "https://api.cryptonator.com/api/ticker/usd-btc", + {}, + 0.0, + ) + + def _handle_response(self, response): + json_response = json.loads(response) + if 'ticker' not in json_response or 'success' not in json_response or \ + json_response['success'] is not True: + raise InvalidExchangeRateResponse(self.name, 'result not found') + return defer.succeed(float(json_response['ticker']['price'])) + + + +class CryptonatorFeed(MarketFeed): + def __init__(self): + MarketFeed.__init__( + self, + "BTCLBC", + "cryptonator.com", + "https://api.cryptonator.com/api/ticker/btc-lbc", + {}, + 0.0, + ) + + def _handle_response(self, response): + json_response = json.loads(response) + if 'ticker' not in json_response or 'success' not in json_response or \ + json_response['success'] is not True: + raise InvalidExchangeRateResponse(self.name, 'result not found') + return defer.succeed(float(json_response['ticker']['price'])) + + def get_default_market_feed(currency_pair): currencies = None if isinstance(currency_pair, str): @@ -168,7 +217,7 @@ def get_default_market_feed(currency_pair): class ExchangeRateManager(object): def __init__(self): self.market_feeds = [ - get_default_market_feed(currency_pair) for currency_pair in CURRENCY_PAIRS] + LBRYioBTCFeed(), LBRYioFeed(), CryptonatorBTCFeed(), CryptonatorFeed()] def start(self): log.info("Starting exchange rate manager") @@ -185,12 +234,13 @@ class ExchangeRateManager(object): log.info("Converting %f %s to %s, rates: %s" % (amount, from_currency, to_currency, rates)) if from_currency == to_currency: return amount + for market in self.market_feeds: - if (market.rate_is_initialized and + if (market.rate_is_initialized and market.is_online and market.rate.currency_pair == (from_currency, to_currency)): return amount * market.rate.spot for market in self.market_feeds: - if (market.rate_is_initialized and + if (market.rate_is_initialized and market.is_online and market.rate.currency_pair[0] == from_currency): return self.convert_currency( market.rate.currency_pair[1], to_currency, amount * market.rate.spot) From 34643b7f95b0a3fd0cebb09979e1e3d06167c2bc Mon Sep 17 00:00:00 2001 From: Miroslav Kovar Date: Thu, 21 Sep 2017 23:36:07 +0200 Subject: [PATCH 2/8] Added changelog entry. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90024ba39..820e64931 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,7 @@ at anytime. * ### Added - * + * Added redundant API server for currency conversion * ### Removed From 433547407e6cac983bad24e5691e4f48027fe722 Mon Sep 17 00:00:00 2001 From: Miroslav Kovar Date: Sun, 8 Oct 2017 16:15:53 +0200 Subject: [PATCH 3/8] Added tests. --- lbrynet/daemon/ExchangeRateManager.py | 18 ++++++--- .../test_ExchangeRateManager.py | 40 +++++++++++++++++++ 2 files changed, 52 insertions(+), 6 deletions(-) diff --git a/lbrynet/daemon/ExchangeRateManager.py b/lbrynet/daemon/ExchangeRateManager.py index 40020fa7c..3e94b8e0f 100644 --- a/lbrynet/daemon/ExchangeRateManager.py +++ b/lbrynet/daemon/ExchangeRateManager.py @@ -173,9 +173,12 @@ class CryptonatorBTCFeed(MarketFeed): ) def _handle_response(self, response): - json_response = json.loads(response) - if 'ticker' not in json_response or 'success' not in json_response or \ - json_response['success'] is not True: + try: + json_response = json.loads(response) + except ValueError: + raise InvalidExchangeRateResponse(self.name, "invalid rate response : %s" % response) + if 'ticker' not in json_response or len(json_response['ticker']) == 0 or \ + 'success' not in json_response or json_response['success'] is not True: raise InvalidExchangeRateResponse(self.name, 'result not found') return defer.succeed(float(json_response['ticker']['price'])) @@ -193,9 +196,12 @@ class CryptonatorFeed(MarketFeed): ) def _handle_response(self, response): - json_response = json.loads(response) - if 'ticker' not in json_response or 'success' not in json_response or \ - json_response['success'] is not True: + try: + json_response = json.loads(response) + except ValueError: + raise InvalidExchangeRateResponse(self.name, "invalid rate response : %s" % response) + if 'ticker' not in json_response or len(json_response['ticker']) == 0 or \ + 'success' not in json_response or json_response['success'] is not True: raise InvalidExchangeRateResponse(self.name, 'result not found') return defer.succeed(float(json_response['ticker']['price'])) diff --git a/lbrynet/tests/unit/lbrynet_daemon/test_ExchangeRateManager.py b/lbrynet/tests/unit/lbrynet_daemon/test_ExchangeRateManager.py index 9c82b449b..0c843209b 100644 --- a/lbrynet/tests/unit/lbrynet_daemon/test_ExchangeRateManager.py +++ b/lbrynet/tests/unit/lbrynet_daemon/test_ExchangeRateManager.py @@ -119,3 +119,43 @@ class LBRYioBTCFeedTest(unittest.TestCase): response = '{"success":true,"result":[]}' with self.assertRaises(InvalidExchangeRateResponse): out = yield feed._handle_response(response) + +class CryptonatorFeedTest(unittest.TestCase): + @defer.inlineCallbacks + def test_handle_response(self): + feed = ExchangeRateManager.CryptonatorFeed() + + response = '{\"ticker\":{\"base\":\"BTC\",\"target\":\"LBC\",\"price\":\"23657.44026496\"' \ + ',\"volume\":\"\",\"change\":\"-5.59806916\"},\"timestamp\":1507470422' \ + ',\"success\":true,\"error\":\"\"}' + out = yield feed._handle_response(response) + expected = 23657.44026496 + self.assertEqual(expected, out) + + response = '{}' + with self.assertRaises(InvalidExchangeRateResponse): + out = yield feed._handle_response(response) + + response = '{"success":true,"ticker":{}}' + with self.assertRaises(InvalidExchangeRateResponse): + out = yield feed._handle_response(response) + +class CryptonatorBTCFeedTest(unittest.TestCase): + @defer.inlineCallbacks + def test_handle_response(self): + feed = ExchangeRateManager.CryptonatorBTCFeed() + + response = '{\"ticker\":{\"base\":\"USD\",\"target\":\"BTC\",\"price\":\"0.00022123\",' \ + '\"volume\":\"\",\"change\":\"-0.00000259\"},\"timestamp\":1507471141,' \ + '\"success\":true,\"error\":\"\"}' + out = yield feed._handle_response(response) + expected = 0.00022123 + self.assertEqual(expected, out) + + response = '{}' + with self.assertRaises(InvalidExchangeRateResponse): + out = yield feed._handle_response(response) + + response = '{"success":true,"ticker":{}}' + with self.assertRaises(InvalidExchangeRateResponse): + out = yield feed._handle_response(response) From 4411c5c202e8db4f5e80aafd318d0b1c2c934625 Mon Sep 17 00:00:00 2001 From: Kay Kurokawa Date: Mon, 23 Oct 2017 16:04:10 -0400 Subject: [PATCH 4/8] add name of feed to log.info --- lbrynet/daemon/ExchangeRateManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lbrynet/daemon/ExchangeRateManager.py b/lbrynet/daemon/ExchangeRateManager.py index 3e94b8e0f..de761a85c 100644 --- a/lbrynet/daemon/ExchangeRateManager.py +++ b/lbrynet/daemon/ExchangeRateManager.py @@ -71,7 +71,7 @@ class MarketFeed(object): return defer.succeed(from_amount / (1.0 - self.fee)) def _save_price(self, price): - log.debug("Saving price update %f for %s" % (price, self.market)) + log.debug("Saving price update %f for %s from %s" % (price, self.market, self.name)) self.rate = ExchangeRate(self.market, price, int(time.time())) def _log_error(self, err): From 7e7931fbf1e25dcab60634ba2ae008f9195b950b Mon Sep 17 00:00:00 2001 From: Kay Kurokawa Date: Mon, 23 Oct 2017 16:05:41 -0400 Subject: [PATCH 5/8] add Bittrex feed as a redundant feed, add unit test for it --- lbrynet/daemon/ExchangeRateManager.py | 5 ++-- .../test_ExchangeRateManager.py | 25 +++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/lbrynet/daemon/ExchangeRateManager.py b/lbrynet/daemon/ExchangeRateManager.py index de761a85c..dfe02bbc1 100644 --- a/lbrynet/daemon/ExchangeRateManager.py +++ b/lbrynet/daemon/ExchangeRateManager.py @@ -5,7 +5,6 @@ import json from twisted.internet import defer, threads from twisted.internet.task import LoopingCall -from lbrynet import conf from lbrynet.core.Error import InvalidExchangeRateResponse log = logging.getLogger(__name__) @@ -102,7 +101,7 @@ class BittrexFeed(MarketFeed): self, "BTCLBC", "Bittrex", - conf.settings['bittrex_feed'], + "https://bittrex.com/api/v1.1/public/getmarkethistory", {'market': 'BTC-LBC', 'count': 50}, BITTREX_FEE ) @@ -223,7 +222,7 @@ def get_default_market_feed(currency_pair): class ExchangeRateManager(object): def __init__(self): self.market_feeds = [ - LBRYioBTCFeed(), LBRYioFeed(), CryptonatorBTCFeed(), CryptonatorFeed()] + LBRYioBTCFeed(), LBRYioFeed(), BittrexFeed(), CryptonatorBTCFeed(), CryptonatorFeed()] def start(self): log.info("Starting exchange rate manager") diff --git a/lbrynet/tests/unit/lbrynet_daemon/test_ExchangeRateManager.py b/lbrynet/tests/unit/lbrynet_daemon/test_ExchangeRateManager.py index 0c843209b..a7d4cb599 100644 --- a/lbrynet/tests/unit/lbrynet_daemon/test_ExchangeRateManager.py +++ b/lbrynet/tests/unit/lbrynet_daemon/test_ExchangeRateManager.py @@ -159,3 +159,28 @@ class CryptonatorBTCFeedTest(unittest.TestCase): response = '{"success":true,"ticker":{}}' with self.assertRaises(InvalidExchangeRateResponse): out = yield feed._handle_response(response) + + +class BittrexFeedTest(unittest.TestCase): + + @defer.inlineCallbacks + def test_handle_response(self): + feed = ExchangeRateManager.BittrexFeed() + + response = '{"success":true,"message":"","result":[{"Id":6902471,"TimeStamp":"2017-02-2'\ + '7T23:41:52.213","Quantity":56.12611239,"Price":0.00001621,"Total":0.00090980,"FillType":"'\ + 'PARTIAL_FILL","OrderType":"SELL"},{"Id":6902403,"TimeStamp":"2017-02-27T23:31:40.463","Qu'\ + 'antity":430.99988180,"Price":0.00001592,"Total":0.00686151,"FillType":"PARTIAL_FILL","Ord'\ + 'erType":"SELL"}]}' + out = yield feed._handle_response(response) + expected = 1.0 / ((0.00090980+0.00686151) / (56.12611239+430.99988180)) + self.assertEqual(expected, out) + + response = '{}' + with self.assertRaises(InvalidExchangeRateResponse): + out = yield feed._handle_response(response) + + response = '{"success":true,"result":[]}' + with self.assertRaises(InvalidExchangeRateResponse): + out = yield feed._handle_response(response) + From 020a2e0e8995155e4d9d4d3ccf32fe7f0da88bad Mon Sep 17 00:00:00 2001 From: Kay Kurokawa Date: Mon, 23 Oct 2017 16:44:26 -0400 Subject: [PATCH 6/8] adjust the _online variable to be set on the errback, so any exception will set _online to False --- lbrynet/daemon/ExchangeRateManager.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lbrynet/daemon/ExchangeRateManager.py b/lbrynet/daemon/ExchangeRateManager.py index dfe02bbc1..339f09383 100644 --- a/lbrynet/daemon/ExchangeRateManager.py +++ b/lbrynet/daemon/ExchangeRateManager.py @@ -56,11 +56,7 @@ class MarketFeed(object): def _make_request(self): r = requests.get(self.url, self.params, timeout=self.REQUESTS_TIMEOUT) - if r.status_code == 200: - self._online = True - return r.text - self._online = False - return "" + return r.text def _handle_response(self, response): return NotImplementedError @@ -72,18 +68,20 @@ class MarketFeed(object): def _save_price(self, price): log.debug("Saving price update %f for %s from %s" % (price, self.market, self.name)) self.rate = ExchangeRate(self.market, price, int(time.time())) + self._online = True - def _log_error(self, err): + def _on_error(self, err): log.warning( "There was a problem updating %s exchange rate information from %s: %s", self.market, self.name, err) + self._online = False def _update_price(self): d = threads.deferToThread(self._make_request) d.addCallback(self._handle_response) d.addCallback(self._subtract_fee) d.addCallback(self._save_price) - d.addErrback(self._log_error) + d.addErrback(self._on_error) return d def start(self): From cf9f9d0e7520ded8c946c07af7ca5db9a015f08c Mon Sep 17 00:00:00 2001 From: Kay Kurokawa Date: Mon, 23 Oct 2017 16:44:40 -0400 Subject: [PATCH 7/8] remove unused get_default_market_feed() function --- lbrynet/daemon/ExchangeRateManager.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/lbrynet/daemon/ExchangeRateManager.py b/lbrynet/daemon/ExchangeRateManager.py index 339f09383..25a06e420 100644 --- a/lbrynet/daemon/ExchangeRateManager.py +++ b/lbrynet/daemon/ExchangeRateManager.py @@ -203,20 +203,6 @@ class CryptonatorFeed(MarketFeed): return defer.succeed(float(json_response['ticker']['price'])) -def get_default_market_feed(currency_pair): - currencies = None - if isinstance(currency_pair, str): - currencies = (currency_pair[0:3], currency_pair[3:6]) - elif isinstance(currency_pair, tuple): - currencies = currency_pair - assert currencies is not None - - if currencies == ("USD", "BTC"): - return LBRYioBTCFeed() - elif currencies == ("BTC", "LBC"): - return LBRYioFeed() - - class ExchangeRateManager(object): def __init__(self): self.market_feeds = [ From ea4b6935c99227e8e8ce1ef41ee920ac8ae1b6c7 Mon Sep 17 00:00:00 2001 From: Kay Kurokawa Date: Mon, 30 Oct 2017 16:01:25 -0400 Subject: [PATCH 8/8] remove unnecessary use of @property --- lbrynet/daemon/ExchangeRateManager.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lbrynet/daemon/ExchangeRateManager.py b/lbrynet/daemon/ExchangeRateManager.py index 25a06e420..923eb4b2b 100644 --- a/lbrynet/daemon/ExchangeRateManager.py +++ b/lbrynet/daemon/ExchangeRateManager.py @@ -46,11 +46,9 @@ class MarketFeed(object): self._updater = LoopingCall(self._update_price) self._online = True - @property def rate_is_initialized(self): return self.rate is not None - @property def is_online(self): return self._online @@ -225,11 +223,11 @@ class ExchangeRateManager(object): return amount for market in self.market_feeds: - if (market.rate_is_initialized and market.is_online and + if (market.rate_is_initialized() and market.is_online() and market.rate.currency_pair == (from_currency, to_currency)): return amount * market.rate.spot for market in self.market_feeds: - if (market.rate_is_initialized and market.is_online and + if (market.rate_is_initialized() and market.is_online() and market.rate.currency_pair[0] == from_currency): return self.convert_currency( market.rate.currency_pair[1], to_currency, amount * market.rate.spot)