added fix for insufficient funds error from bitrex, looking at possibility to test it it
This commit is contained in:
parent
743a1f1604
commit
4c0f710a76
@ -14,3 +14,10 @@ class OperationalException(BaseException):
|
|||||||
Requires manual intervention.
|
Requires manual intervention.
|
||||||
This happens when an exchange returns an unexpected error during runtime.
|
This happens when an exchange returns an unexpected error during runtime.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
|
||||||
|
class NotEnoughFundsExeption(BaseException):
|
||||||
|
"""
|
||||||
|
This happens when the exchange reports that not enough funds where available. We do not want to stop
|
||||||
|
the bot in this case and just keep it going and suppress this message
|
||||||
|
"""
|
||||||
|
@ -5,7 +5,7 @@ from bittrex.bittrex import API_V1_1, API_V2_0
|
|||||||
from bittrex.bittrex import Bittrex as _Bittrex
|
from bittrex.bittrex import Bittrex as _Bittrex
|
||||||
from requests.exceptions import ContentDecodingError
|
from requests.exceptions import ContentDecodingError
|
||||||
|
|
||||||
from freqtrade import OperationalException
|
from freqtrade import OperationalException, NotEnoughFundsExeption
|
||||||
from freqtrade.exchange.interface import Exchange
|
from freqtrade.exchange.interface import Exchange
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
@ -63,11 +63,19 @@ class Bittrex(Exchange):
|
|||||||
data = _API.buy_limit(pair.replace('_', '-'), amount, rate)
|
data = _API.buy_limit(pair.replace('_', '-'), amount, rate)
|
||||||
if not data['success']:
|
if not data['success']:
|
||||||
Bittrex._validate_response(data)
|
Bittrex._validate_response(data)
|
||||||
raise OperationalException('{message} params=({pair}, {rate}, {amount})'.format(
|
|
||||||
message=data['message'],
|
if data['message'] == "INSUFFICIENT_FUNDS":
|
||||||
pair=pair,
|
raise NotEnoughFundsExeption('{message} params=({pair}, {rate}, {amount})'.format(
|
||||||
rate=rate,
|
message=data['message'],
|
||||||
amount=amount))
|
pair=pair,
|
||||||
|
rate=rate,
|
||||||
|
amount=amount))
|
||||||
|
else:
|
||||||
|
raise OperationalException('{message} params=({pair}, {rate}, {amount})'.format(
|
||||||
|
message=data['message'],
|
||||||
|
pair=pair,
|
||||||
|
rate=rate,
|
||||||
|
amount=amount))
|
||||||
return data['result']['uuid']
|
return data['result']['uuid']
|
||||||
|
|
||||||
def sell(self, pair: str, rate: float, amount: float) -> str:
|
def sell(self, pair: str, rate: float, amount: float) -> str:
|
||||||
|
@ -15,8 +15,8 @@ import requests
|
|||||||
from cachetools import cached, TTLCache
|
from cachetools import cached, TTLCache
|
||||||
|
|
||||||
from freqtrade import (
|
from freqtrade import (
|
||||||
DependencyException, OperationalException, exchange, persistence, __version__
|
DependencyException, OperationalException, exchange, persistence, __version__,
|
||||||
)
|
NotEnoughFundsExeption)
|
||||||
from freqtrade.analyze import Analyze
|
from freqtrade.analyze import Analyze
|
||||||
from freqtrade import constants
|
from freqtrade import constants
|
||||||
from freqtrade.fiat_convert import CryptoToFiatConverter
|
from freqtrade.fiat_convert import CryptoToFiatConverter
|
||||||
@ -24,7 +24,6 @@ from freqtrade.persistence import Trade
|
|||||||
from freqtrade.rpc.rpc_manager import RPCManager
|
from freqtrade.rpc.rpc_manager import RPCManager
|
||||||
from freqtrade.state import State
|
from freqtrade.state import State
|
||||||
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
@ -166,7 +165,11 @@ class FreqtradeBot(object):
|
|||||||
|
|
||||||
# Then looking for buy opportunities
|
# Then looking for buy opportunities
|
||||||
if len(trades) < self.config['max_open_trades']:
|
if len(trades) < self.config['max_open_trades']:
|
||||||
state_changed = self.process_maybe_execute_buy()
|
try:
|
||||||
|
state_changed = self.process_maybe_execute_buy()
|
||||||
|
except NotEnoughFundsExeption:
|
||||||
|
logger.warning('insufficient funds to execute this buy order, ignoring it!')
|
||||||
|
state_changed = False
|
||||||
|
|
||||||
if 'unfilledtimeout' in self.config:
|
if 'unfilledtimeout' in self.config:
|
||||||
# Check and handle any timed out open orders
|
# Check and handle any timed out open orders
|
||||||
@ -176,10 +179,11 @@ class FreqtradeBot(object):
|
|||||||
except (requests.exceptions.RequestException, json.JSONDecodeError) as error:
|
except (requests.exceptions.RequestException, json.JSONDecodeError) as error:
|
||||||
logger.warning('%s, retrying in 30 seconds...', error)
|
logger.warning('%s, retrying in 30 seconds...', error)
|
||||||
time.sleep(constants.RETRY_TIMEOUT)
|
time.sleep(constants.RETRY_TIMEOUT)
|
||||||
|
|
||||||
except OperationalException:
|
except OperationalException:
|
||||||
self.rpc.send_msg(
|
self.rpc.send_msg(
|
||||||
'*Status:* OperationalException:\n```\n{traceback}```{hint}'
|
'*Status:* OperationalException:\n```\n{traceback}```{hint}'
|
||||||
.format(
|
.format(
|
||||||
traceback=traceback.format_exc(),
|
traceback=traceback.format_exc(),
|
||||||
hint='Issue `/start` if you think it is safe to restart.'
|
hint='Issue `/start` if you think it is safe to restart.'
|
||||||
)
|
)
|
||||||
@ -301,7 +305,7 @@ class FreqtradeBot(object):
|
|||||||
# Create trade entity and return
|
# Create trade entity and return
|
||||||
self.rpc.send_msg(
|
self.rpc.send_msg(
|
||||||
'*{}:* Buying [{}]({}) with limit `{:.8f} ({:.6f} {}, {:.3f} {})` '
|
'*{}:* Buying [{}]({}) with limit `{:.8f} ({:.6f} {}, {:.3f} {})` '
|
||||||
.format(
|
.format(
|
||||||
exchange.get_name().upper(),
|
exchange.get_name().upper(),
|
||||||
pair.replace('_', '/'),
|
pair.replace('_', '/'),
|
||||||
exchange.get_pair_detail_url(pair),
|
exchange.get_pair_detail_url(pair),
|
||||||
@ -484,15 +488,15 @@ class FreqtradeBot(object):
|
|||||||
"*Current Rate:* `{current_rate:.8f}`\n" \
|
"*Current Rate:* `{current_rate:.8f}`\n" \
|
||||||
"*Profit:* `{profit:.2f}%`" \
|
"*Profit:* `{profit:.2f}%`" \
|
||||||
"".format(
|
"".format(
|
||||||
exchange=trade.exchange,
|
exchange=trade.exchange,
|
||||||
pair=trade.pair,
|
pair=trade.pair,
|
||||||
pair_url=exchange.get_pair_detail_url(trade.pair),
|
pair_url=exchange.get_pair_detail_url(trade.pair),
|
||||||
limit=limit,
|
limit=limit,
|
||||||
open_rate=trade.open_rate,
|
open_rate=trade.open_rate,
|
||||||
current_rate=current_rate,
|
current_rate=current_rate,
|
||||||
amount=round(trade.amount, 8),
|
amount=round(trade.amount, 8),
|
||||||
profit=round(profit * 100, 2),
|
profit=round(profit * 100, 2),
|
||||||
)
|
)
|
||||||
|
|
||||||
# For regular case, when the configuration exists
|
# For regular case, when the configuration exists
|
||||||
if 'stake_currency' in self.config and 'fiat_display_currency' in self.config:
|
if 'stake_currency' in self.config and 'fiat_display_currency' in self.config:
|
||||||
@ -505,13 +509,13 @@ class FreqtradeBot(object):
|
|||||||
message += '` ({gain}: {profit_percent:.2f}%, {profit_coin:.8f} {coin}`' \
|
message += '` ({gain}: {profit_percent:.2f}%, {profit_coin:.8f} {coin}`' \
|
||||||
'` / {profit_fiat:.3f} {fiat})`' \
|
'` / {profit_fiat:.3f} {fiat})`' \
|
||||||
''.format(
|
''.format(
|
||||||
gain="profit" if fmt_exp_profit > 0 else "loss",
|
gain="profit" if fmt_exp_profit > 0 else "loss",
|
||||||
profit_percent=fmt_exp_profit,
|
profit_percent=fmt_exp_profit,
|
||||||
profit_coin=profit_trade,
|
profit_coin=profit_trade,
|
||||||
coin=self.config['stake_currency'],
|
coin=self.config['stake_currency'],
|
||||||
profit_fiat=profit_fiat,
|
profit_fiat=profit_fiat,
|
||||||
fiat=self.config['fiat_display_currency'],
|
fiat=self.config['fiat_display_currency'],
|
||||||
)
|
)
|
||||||
# Because telegram._forcesell does not have the configuration
|
# Because telegram._forcesell does not have the configuration
|
||||||
# Ignore the FIAT value and does not show the stake_currency as well
|
# Ignore the FIAT value and does not show the stake_currency as well
|
||||||
else:
|
else:
|
||||||
|
2
freqtrade/tests/testdata/BTC_ADA-5.json
vendored
2
freqtrade/tests/testdata/BTC_ADA-5.json
vendored
File diff suppressed because one or more lines are too long
2
freqtrade/tests/testdata/BTC_DASH-5.json
vendored
2
freqtrade/tests/testdata/BTC_DASH-5.json
vendored
File diff suppressed because one or more lines are too long
2
freqtrade/tests/testdata/BTC_ETC-5.json
vendored
2
freqtrade/tests/testdata/BTC_ETC-5.json
vendored
File diff suppressed because one or more lines are too long
2
freqtrade/tests/testdata/BTC_ETH-5.json
vendored
2
freqtrade/tests/testdata/BTC_ETH-5.json
vendored
File diff suppressed because one or more lines are too long
2
freqtrade/tests/testdata/BTC_LTC-5.json
vendored
2
freqtrade/tests/testdata/BTC_LTC-5.json
vendored
File diff suppressed because one or more lines are too long
2
freqtrade/tests/testdata/BTC_NXT-5.json
vendored
2
freqtrade/tests/testdata/BTC_NXT-5.json
vendored
File diff suppressed because one or more lines are too long
2
freqtrade/tests/testdata/BTC_POWR-5.json
vendored
2
freqtrade/tests/testdata/BTC_POWR-5.json
vendored
File diff suppressed because one or more lines are too long
2
freqtrade/tests/testdata/BTC_XLM-5.json
vendored
2
freqtrade/tests/testdata/BTC_XLM-5.json
vendored
File diff suppressed because one or more lines are too long
2
freqtrade/tests/testdata/BTC_XMR-5.json
vendored
2
freqtrade/tests/testdata/BTC_XMR-5.json
vendored
File diff suppressed because one or more lines are too long
2
freqtrade/tests/testdata/BTC_ZEC-5.json
vendored
2
freqtrade/tests/testdata/BTC_ZEC-5.json
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user