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

updated collateral_currency

Browse Source
This commit is contained in:
Sam Germain 2021-06-20 15:06:36 -06:00
parent 62226fe58c
commit 6c7c07d7c6
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
freqtrade/persistence/migrations.py
View File

@ -51,6 +51,7 @@ def migrate_trades_table(decl_base, inspector, engine, table_back_name: str, col
leverage = get_column_def(cols, 'leverage', '0.0') leverage = get_column_def(cols, 'leverage', '0.0')
borrowed = get_column_def(cols, 'borrowed', '0.0') borrowed = get_column_def(cols, 'borrowed', '0.0')
borrowed_currency = get_column_def(cols, 'borrowed_currency', 'null') borrowed_currency = get_column_def(cols, 'borrowed_currency', 'null')
collateral_currency = get_column_def(cols, 'collateral_currency', 'null')
interest_rate = get_column_def(cols, 'interest_rate', '0.0') interest_rate = get_column_def(cols, 'interest_rate', '0.0')
liquidation_price = get_column_def(cols, 'liquidation_price', 'null') liquidation_price = get_column_def(cols, 'liquidation_price', 'null')
is_short = get_column_def(cols, 'is_short', 'False') is_short = get_column_def(cols, 'is_short', 'False')
@ -89,7 +90,7 @@ def migrate_trades_table(decl_base, inspector, engine, table_back_name: str, col
stoploss_order_id, stoploss_last_update, stoploss_order_id, stoploss_last_update,
max_rate, min_rate, sell_reason, close_order_status, strategy, max_rate, min_rate, sell_reason, close_order_status, strategy,
timeframe, open_trade_value, close_profit_abs, timeframe, open_trade_value, close_profit_abs,
leverage, borrowed, borrowed_currency, interest_rate, liquidation_price, is_short leverage, borrowed, borrowed_currency, collateral_currency, interest_rate, liquidation_price, is_short
) )
select id, lower(exchange), select id, lower(exchange),
case case
@ -114,7 +115,8 @@ def migrate_trades_table(decl_base, inspector, engine, table_back_name: str, col
{strategy} strategy, {timeframe} timeframe, {strategy} strategy, {timeframe} timeframe,
{open_trade_value} open_trade_value, {close_profit_abs} close_profit_abs, {open_trade_value} open_trade_value, {close_profit_abs} close_profit_abs,
{leverage} leverage, {borrowed} borrowed, {borrowed_currency} borrowed_currency, {leverage} leverage, {borrowed} borrowed, {borrowed_currency} borrowed_currency,
{interest_rate} interest_rate, {liquidation_price} liquidation_price, {is_short} is_short {collateral_currency} collateral_currency, {interest_rate} interest_rate,
{liquidation_price} liquidation_price, {is_short} is_short
from {table_back_name} from {table_back_name}
""")) """))

5
freqtrade/persistence/models.py
View File

@ -265,7 +265,8 @@ class LocalTrade():
# Margin trading properties # Margin trading properties
leverage: Optional[float] = 0.0 leverage: Optional[float] = 0.0
borrowed: float = 0.0 borrowed: float = 0.0
borrowed_currency: float = None borrowed_currency: str = None
collateral_currency: str = None
interest_rate: float = 0.0 interest_rate: float = 0.0
liquidation_price: float = None liquidation_price: float = None
is_short: bool = False is_short: bool = False
@ -367,6 +368,7 @@ class LocalTrade():
'leverage': self.leverage, 'leverage': self.leverage,
'borrowed': self.borrowed, 'borrowed': self.borrowed,
'borrowed_currency': self.borrowed_currency, 'borrowed_currency': self.borrowed_currency,
'collateral_currency': self.collateral_currency,
'interest_rate': self.interest_rate, 'interest_rate': self.interest_rate,
'liquidation_price': self.liquidation_price, 'liquidation_price': self.liquidation_price,
'leverage': self.leverage, 'leverage': self.leverage,
@ -775,6 +777,7 @@ class Trade(_DECL_BASE, LocalTrade):
leverage = Column(Float, nullable=True, default=0.0) leverage = Column(Float, nullable=True, default=0.0)
borrowed = Column(Float, nullable=False, default=0.0) borrowed = Column(Float, nullable=False, default=0.0)
borrowed_currency = Column(Float, nullable=True) borrowed_currency = Column(Float, nullable=True)
collateral_currency = Column(String(25), nullable=True)
interest_rate = Column(Float, nullable=False, default=0.0) interest_rate = Column(Float, nullable=False, default=0.0)
liquidation_price = Column(Float, nullable=True) liquidation_price = Column(Float, nullable=True)
is_short = Column(Boolean, nullable=False, default=False) is_short = Column(Boolean, nullable=False, default=False)