X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helper.py;h=3e39785d4bb1a75d5bde324403161ddc3dcc053a;hb=97922ff1826cc6b9c0329cc30e8d4621bb2644ee;hp=421e8cdc9b7f0adcbe3af64328fe178681a16eed;hpb=5a72ded790f8b5e7c9b38a3cc91c12fbfb6cb97a;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FTrader.git diff --git a/helper.py b/helper.py index 421e8cd..3e39785 100644 --- a/helper.py +++ b/helper.py @@ -4,10 +4,13 @@ from store import * def move_balances(market, debug=False): needed_in_margin = {} + for currency in BalanceStore.all: + if BalanceStore.all[currency].margin_free != 0: + needed_in_margin[currency] = 0 for trade in TradeStore.all: + if trade.value_to.currency not in needed_in_margin: + needed_in_margin[trade.value_to.currency] = 0 if trade.trade_type == "short": - if trade.value_to.currency not in needed_in_margin: - needed_in_margin[trade.value_to.currency] = 0 needed_in_margin[trade.value_to.currency] += abs(trade.value_to) for currency, needed in needed_in_margin.items(): current_balance = BalanceStore.all[currency].margin_free @@ -109,12 +112,20 @@ def follow_orders(verbose=True, sleep=None): print("All orders finished") def print_orders(market, base_currency="BTC"): - prepare_trades(market, base_currency=base_currency, compute_value="average") + prepare_trades(market, base_currency=base_currency, compute_value="average", debug=True) TradeStore.prepare_orders(compute_value="average") for currency, balance in BalanceStore.all.items(): print(balance) TradeStore.print_all_with_order() +def print_balances(market, base_currency="BTC"): + BalanceStore.fetch_balances(market) + for currency, balance in BalanceStore.all.items(): + print(balance) + if base_currency is not None: + print("total:") + print(sum(BalanceStore.in_currency(base_currency, market).values())) + def process_sell_needed__1_sell(market, base_currency="BTC", debug=False): prepare_trades(market, base_currency=base_currency, debug=debug) TradeStore.prepare_orders(compute_value="average", only="dispose") @@ -127,7 +138,7 @@ def process_sell_needed__1_sell(market, base_currency="BTC", debug=False): TradeStore.run_orders() follow_orders() -def process_sell_needed__2_sell(market, base_currency="BTC", debug=False): +def process_sell_needed__2_buy(market, base_currency="BTC", debug=False): update_trades(market, base_currency=base_currency, debug=debug, only="acquire") TradeStore.prepare_orders(compute_value="average", only="acquire") print("------------------")