X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=market.py;h=8672c59699431846ac097173bf5cb9ab076b3910;hb=83c698c925db9dcb2d347c2a625de88d85cfeb21;hp=388dea0cadb1265f966c1aa4afe2c66b85f93c26;hpb=ada1b5f109ebaa6f3adb7cd87b007c6db891811c;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FTrader.git

diff --git a/market.py b/market.py
index 388dea0..8672c59 100644
--- a/market.py
+++ b/market.py
@@ -46,6 +46,7 @@ class Market:
         return cls(ccxt_instance, debug=debug, user_id=user_id, report_path=report_path)
 
     def store_report(self):
+        self.report.merge(Portfolio.report)
         try:
             if self.report_path is not None:
                 report_file = "{}/{}_{}.json".format(self.report_path, datetime.now().isoformat(), self.user_id)
@@ -192,6 +193,33 @@ class Market:
 
 class Processor:
     scenarios = {
+            "wait_for_cryptoportfolio": [
+                {
+                    "name": "wait",
+                    "number": 1,
+                    "before": False,
+                    "after": True,
+                    "wait_for_recent": {},
+                    },
+                ],
+            "print_orders": [
+                {
+                    "name": "wait",
+                    "number": 1,
+                    "before": False,
+                    "after": True,
+                    "wait_for_recent": {},
+                    },
+                {
+                    "name": "make_orders",
+                    "number": 2,
+                    "before": False,
+                    "after": True,
+                    "fetch_balances": ["begin"],
+                    "prepare_trades": { "compute_value": "average" },
+                    "prepare_orders": { "compute_value": "average" },
+                    },
+                ],
             "sell_needed": [
                 {
                     "name": "wait",