-from ccxt import ExchangeError, NotSupported
+from ccxt import ExchangeError, NotSupported, RequestTimeout, InvalidNonce
import ccxt_wrapper as ccxt
import time
import psycopg2
from store import *
from cachetools.func import ttl_cache
from datetime import datetime
+from retry import retry
import portfolio
class Market:
ccxt_instance = ccxt.poloniexE(config)
- # For requests logging
- ccxt_instance.session.origin_request = ccxt_instance.session.request
- ccxt_instance.session._parent = ccxt_instance
-
- def request_wrap(self, *args, **kwargs):
- r = self.origin_request(*args, **kwargs)
- self._parent._market.report.log_http_request(args[0],
- args[1], kwargs["data"], kwargs["headers"], r)
- return r
- ccxt_instance.session.request = request_wrap.__get__(ccxt_instance.session,
- ccxt_instance.session.__class__)
-
return cls(ccxt_instance, args, **kwargs)
def store_report(self):
finally:
self.store_report()
+ @retry((RequestTimeout, InvalidNonce), tries=5)
def move_balances(self):
needed_in_margin = {}
moving_to_margin = {}
current_balance = self.balances.all[currency].margin_available
moving_to_margin[currency] = (needed - current_balance)
delta = moving_to_margin[currency].value
+ action = "Moving {} from exchange to margin".format(moving_to_margin[currency])
+
if self.debug and delta != 0:
- self.report.log_debug_action("Moving {} from exchange to margin".format(moving_to_margin[currency]))
+ self.report.log_debug_action(action)
continue
- if delta > 0:
- self.ccxt.transfer_balance(currency, delta, "exchange", "margin")
- elif delta < 0:
- self.ccxt.transfer_balance(currency, -delta, "margin", "exchange")
+ try:
+ if delta > 0:
+ self.ccxt.transfer_balance(currency, delta, "exchange", "margin")
+ elif delta < 0:
+ self.ccxt.transfer_balance(currency, -delta, "margin", "exchange")
+ except (RequestTimeout, InvalidNonce) as e:
+ self.report.log_error(action, message="Retrying", exception=e)
+ self.report.log_move_balances(needed_in_margin, moving_to_margin)
+ self.balances.fetch_balances()
+ raise e
self.report.log_move_balances(needed_in_margin, moving_to_margin)
self.balances.fetch_balances()