adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed breaking changes, can run the bot again

Browse Source
This commit is contained in:
Sam Germain 2021-06-20 15:34:05 -06:00
parent 6c7c07d7c6
commit 9891c6e111
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
freqtrade/persistence/models.py
View File

@ -467,7 +467,7 @@ class LocalTrade():
logger.info('Updating trade (id=%s) ...', self.id) logger.info('Updating trade (id=%s) ...', self.id)
if order_type in ('market', 'limit') and self.isOpeningTrade(order['side']): if order_type in ('market', 'limit') and self.is_opening_trade(order['side']):
# Update open rate and actual amount # Update open rate and actual amount
self.open_rate = float(safe_value_fallback(order, 'average', 'price')) self.open_rate = float(safe_value_fallback(order, 'average', 'price'))
self.amount = float(safe_value_fallback(order, 'filled', 'amount')) self.amount = float(safe_value_fallback(order, 'filled', 'amount'))
@ -476,7 +476,7 @@ class LocalTrade():
payment = "SELL" if self.is_short else "BUY" payment = "SELL" if self.is_short else "BUY"
logger.info(f'{order_type.upper()}_{payment} order has been fulfilled for {self}.') logger.info(f'{order_type.upper()}_{payment} order has been fulfilled for {self}.')
self.open_order_id = None self.open_order_id = None
elif order_type in ('market', 'limit') and self.isClosingTrade(order['side']): elif order_type in ('market', 'limit') and self.is_closing_trade(order['side']):
if self.is_open: if self.is_open:
payment = "BUY" if self.is_short else "SELL" payment = "BUY" if self.is_short else "SELL"
logger.info(f'{order_type.upper()}_{payment} order has been fulfilled for {self}.') logger.info(f'{order_type.upper()}_{payment} order has been fulfilled for {self}.')
@ -577,7 +577,7 @@ class LocalTrade():
close_trade = Decimal(self.amount) * Decimal(rate or self.close_rate) # type: ignore close_trade = Decimal(self.amount) * Decimal(rate or self.close_rate) # type: ignore
fees = close_trade * Decimal(fee or self.fee_close) fees = close_trade * Decimal(fee or self.fee_close)
#TODO: Interest rate could be hourly instead of daily #TODO: Interest rate could be hourly instead of daily
interest = ((self.interest_rate * Decimal(self.borrowed)) * (datetime.utcnow() - self.open_date).days) or 0 # Interest/day * num of days interest = ((Decimal(self.interest_rate) * Decimal(self.borrowed)) * Decimal((datetime.utcnow() - self.open_date).days)) or 0 # Interest/day * num of days
if (self.is_short): if (self.is_short):
return float(close_trade + fees + interest) return float(close_trade + fees + interest)
else: else: