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

fix dry_orders

Browse Source
This commit is contained in:
iuvbio 2019-02-23 16:03:15 +01:00
parent 9a097214a6
commit ec6794b9ba
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
freqtrade/exchange/exchange.py
View File

@ -290,15 +290,28 @@ class Exchange(object):
'pair': pair, 'pair': pair,
'price': rate, 'price': rate,
'amount': amount, 'amount': amount,
"cost": amount * rate,
'type': ordertype, 'type': ordertype,
'side': 'buy', 'side': 'buy',
'remaining': 0.0, 'remaining': amount,
'datetime': arrow.utcnow().isoformat(), 'datetime': arrow.utcnow().isoformat(),
'status': 'closed', 'status': "open",
'fee': None 'fee': None,
"info": {}
} }
self.store_dry_order(dry_order)
return dry_order return dry_order
def store_dry_order(self, dry_order: Dict) -> None:
closed_order = dry_order.copy()
if closed_order["type"] in ["market", "limit"]:
closed_order.update({
"status": "closed",
"filled": closed_order["amount"],
"remaining": 0
})
self._dry_run_open_orders[closed_order["id"]] = closed_order
def create_order(self, pair: str, ordertype: str, side: str, amount: float, def create_order(self, pair: str, ordertype: str, side: str, amount: float,
rate: float, params: Dict = {}) -> Dict: rate: float, params: Dict = {}) -> Dict:
try: try:
@ -330,8 +343,7 @@ class Exchange(object):
if self._conf['dry_run']: if self._conf['dry_run']:
dry_order = self.dry_run_order(pair, ordertype, "buy", amount, rate) dry_order = self.dry_run_order(pair, ordertype, "buy", amount, rate)
self._dry_run_open_orders[dry_order["id"]] = dry_order return dry_order
return dry_order # {"id": dry_order["id"]}
params = self._params.copy() params = self._params.copy()
if time_in_force != 'gtc': if time_in_force != 'gtc':
@ -344,8 +356,7 @@ class Exchange(object):
if self._conf['dry_run']: if self._conf['dry_run']:
dry_order = self.dry_run_order(pair, ordertype, "sell", amount, rate) dry_order = self.dry_run_order(pair, ordertype, "sell", amount, rate)
self._dry_run_open_orders[dry_order["id"]] = dry_order return dry_order
return dry_order # {"id": dry_order["id"]}
params = self._params.copy() params = self._params.copy()
if time_in_force != 'gtc': if time_in_force != 'gtc':
@ -370,8 +381,6 @@ class Exchange(object):
if self._conf['dry_run']: if self._conf['dry_run']:
dry_order = self.dry_run_order( dry_order = self.dry_run_order(
pair, ordertype, "sell", amount, stop_price) pair, ordertype, "sell", amount, stop_price)
dry_order.update({"info": {}, "remaining": amount, "status": "open"})
self._dry_run_open_orders[dry_order["id"]] = dry_order
return dry_order return dry_order
params = self._params.copy() params = self._params.copy()
@ -586,9 +595,6 @@ class Exchange(object):
def get_order(self, order_id: str, pair: str) -> Dict: def get_order(self, order_id: str, pair: str) -> Dict:
if self._conf['dry_run']: if self._conf['dry_run']:
order = self._dry_run_open_orders[order_id] order = self._dry_run_open_orders[order_id]
order.update({
'id': order_id
})
return order return order
try: try:
return self._api.fetch_order(order_id, pair) return self._api.fetch_order(order_id, pair)