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

Remove get_fee_maker/taker and add argument to get_fee instead

Browse Source
This commit is contained in:
enenn 2018-04-09 21:04:52 +02:00
parent 91b2092d55
commit 6115fb08c0
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
freqtrade/exchange/__init__.py
View File

@ -342,18 +342,12 @@ def get_id() -> str:
return _API.id return _API.id
def get_fee_maker() -> float: def get_fee(symbol='ETH/BTC', type='', side='', amount=1,
return _API.fees['trading']['maker'] price=1, taker_or_maker='maker') -> float:
def get_fee_taker() -> float:
return _API.fees['trading']['taker']
def get_fee() -> float:
# validate that markets are loaded before trying to get fee # validate that markets are loaded before trying to get fee
if _API.markets is None or len(_API.markets) == 0: if _API.markets is None or len(_API.markets) == 0:
_API.load_markets() _API.load_markets()
return _API.calculate_fee(symbol='ETH/BTC', type='', side='', amount=1, price=1)['rate'] return _API.calculate_fee(symbol=symbol, type=type, side=side, amount=amount,
price=price, takerOrMaker=taker_or_maker)['rate']

2
freqtrade/freqtradebot.py
View File

@ -323,7 +323,7 @@ class FreqtradeBot(object):
pair=pair, pair=pair,
stake_amount=stake_amount, stake_amount=stake_amount,
amount=amount, amount=amount,
fee=exchange.get_fee_maker(), fee=exchange.get_fee(taker_or_maker='maker'),
open_rate=buy_limit, open_rate=buy_limit,
open_date=datetime.utcnow(), open_date=datetime.utcnow(),
exchange=exchange.get_id(), exchange=exchange.get_id(),