From 4a3d5ddfe47c67a3c6fc3977668354fafb860415 Mon Sep 17 00:00:00 2001
From: David Brazda <davidbrazda61@gmail.com>
Date: Tue, 29 Aug 2023 15:39:24 +0200
Subject: [PATCH] minor changes

---
 .../trade_offline_streamer.cpython-310.pyc    | Bin 5030 -> 4969 bytes
 v2realbot/loader/trade_offline_streamer.py    |   7 ++++---
 v2realbot/strategy/StrategyClassicSL.py       |   6 ++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/v2realbot/loader/__pycache__/trade_offline_streamer.cpython-310.pyc b/v2realbot/loader/__pycache__/trade_offline_streamer.cpython-310.pyc
index d443c48efbd5d559345dcc9c7bbf156032e62942..2373ebaadd2a950e5eef249f08ffaeb8544a2551 100644
GIT binary patch
delta 918
zcmZ9K&rcIU6vyZ7F73AaquUl}3kAw=P{DA~L@^{PdQs6xLTDhQb}*s9V#^>2nYD+F
znqUmXi6^7kUc4*+fbnL$c_A_3WMa~TC;bC_Q{+e7$?U%O=DqKH-t4>|tPfagmK7!V
zJpc2HiVxOgSox`n>F^gQicWn(tm*0MYeuNy1Ca6q*1{F4Wrz>dOcB<?T6w4x4^lOZ
z_>dx}qKQ*cD@D98BRnisSen`?v@xc$OsOqs=Xwn)KUkdWH0CQi2`|F3K?jf2z>6|c
zr4HA91;`AcM8n~$KwN!{tRHNmoE)<_-6__22q%$nCTRSn>KUArx`G@x4#jBVXjQ66
zn{@|0H4^l)<{D^3CCg+NDlu8#uv*>AxV77aXONWiZnnYMjGT6ZvyVrS^nbj_7|N`V
zh)<DpwK7gyJkwQZt7oE2ikokgw~7?w(d%UXiD$8X6tU#7dNyXHxh?yp883Di$E+pK
z!A?vzz#ZBqGmlwaj9U%XkFG?$%1!LxDQ(BhY=%6p0=ho!_~$mfT`1=z6dMeNP9)_Y
ztAX5LoFGOgk5L;@Gz2B3umnU9%Zsz&;0%ukXW2RK_)x<E*lqb8=4UPvFDBJbRQnoy
z8bW+V(Jt9HQYtbD=S{p+gyw{8q$ZAKY4?#VuJy<Y%>0ISue9+Cw2y&LN(u#uN6CFM
z+`mVS4G?v6zvIUAma$n_Vhaz~DhuT+Tj9G?*CwYg<?4VpT^v}?U_?-Rd+)b>0g|^c
zmJbydSC$u7zpF);RVKx_(*>`@oO51rRI%d>HQR|0Xo?NGYAR7x15+J}h_6n&y04Fl
zx-)Ogp-LqrUw8KI#Wl#}<As$+g<@fp7Fc0)(cM^GuNZPG;U=<>7cUaqO~r=amK+J?
LW#x>xot*s(nv~*|

delta 991
zcmZ9LTWb?R6vyXmw#hcxO?J0wH|Z_CU$m{%2gN&hEBMeBtxCmOVkgq3?bamI7RxL_
z7JMjF3o9asvU$-L5lZkQ_}~W+CE%k%MZbe*w$v7PnB6mH&iv1B&dl!iz3talG%ZT-
z8T$2yKHAZ)L?l)ArXrtV&1+XK#0=I*V^rOO6!C5;nerP(sOAEY!hP1nB`T+h3p8#K
z*2F9x&KrKJf*uzva>#2Q@+K_eL>S=_p~BKsx6nqP!kY6fek)fhQ2fmdu2933o|#TP
zYxCQAeFdB-BV}rG#g%~ECX~q7+z=3386~Bk>nJDMG<JJ}W%l3%5_Xd|Y=xW{C;1M)
zlgIYNXmWp6s0f>N`P~)b_poFIWD+8aWE+Ypu|BXe_8ClV*I^AB1-;!Ga5f=lJmBo*
zQ6&8zuYMF|N+-Mz^{H}cj9S!Mlu-8?O*yJ9(X^wYU^7==Nv|a#%cGacjO%Eu59Ksb
zU?+|dEj%uEPAw;~=f^19(Q!}e!6C7JuG3br<{$rKjL-u9Pj*@GU*syLe@WXgv^`DM
z07oxq=J0463iASw4fulxlHwFAAQGG<2-Lw7R7WTokx4!xP!UOU40gmn$_;;r4RhUv
z3O2wB6n1!`Os$i|NeKA^*?><*h%YGGDJp=FSfRo^_M3Ro2<-~$B9a7GE=Xh?PDH!+
z6Jd0Zh{m-)(C!sBeu4Hea1$giQ4qwG+#rMf)$_4c(07yg0}Mhfvb<ogvRuils$bi7
z0i9Q;He&191vdL&r8rwSw-K3~xO8Rebcgp&djccgNPJT&rm7#~r=VdR!|#OWa!ZT3
z<yvUYX2mfN^b9=rI`w0+De2%{*9Vd*GYqm62PLFR(U1&k=(yrN)muW}lwt3^J`=l#
zI>oSfO;(eJ4C$JYU3!?E%Z|`2%Z}vi)#Xw#hVwOV)NF;CH*Rj$<%02db2xlgtep1r
GhUvd7uJXJ9

diff --git a/v2realbot/loader/trade_offline_streamer.py b/v2realbot/loader/trade_offline_streamer.py
index 2bf6d80..149411e 100644
--- a/v2realbot/loader/trade_offline_streamer.py
+++ b/v2realbot/loader/trade_offline_streamer.py
@@ -107,7 +107,7 @@ class Trade_Offline_Streamer(Thread):
             #make it offset aware
             day.open = day.open.replace(tzinfo=zoneNY)
             #add 20 minutes of premarket
-            day.open = day.open - timedelta(minutes=20)
+            #day.open = day.open - timedelta(minutes=20)
             day.close = day.close.replace(tzinfo=zoneNY)
                                      
             ##pokud datum do je mensi day.open, tak tento den neresime
@@ -159,7 +159,7 @@ class Trade_Offline_Streamer(Thread):
             # (např. požadovaná start až od 10:00)
 
             #docasne disablujeme wait for queue, aby nam mohl jit i premarket
-            if self.time_from > day.open or 1==1:
+            if self.time_from > day.open: # or 1==1:
                 wait_for_q = False
             else:
                 wait_for_q = True
@@ -183,7 +183,8 @@ class Trade_Offline_Streamer(Thread):
                     ##ic(t['t'])
 
                     #poustime i 20 minut premarketu pro presnejsi populaci slopu v prvnich minutech
-                    if self.time_from - timedelta(minutes=20) < to_datetime(t['t']) < self.time_to:
+                    # - timedelta(minutes=20)
+                    if self.time_from < to_datetime(t['t']) < self.time_to:
                         #poustime dal, jinak ne
                         if wait_for_q:
                             #cekame na Q nebo na O (nekterym dnum chybelo Q)
diff --git a/v2realbot/strategy/StrategyClassicSL.py b/v2realbot/strategy/StrategyClassicSL.py
index 87e80b3..66fac65 100644
--- a/v2realbot/strategy/StrategyClassicSL.py
+++ b/v2realbot/strategy/StrategyClassicSL.py
@@ -162,7 +162,8 @@ class StrategyClassicSL(Strategy):
 
         self.state.blockbuy = 1
         self.state.vars.lastbuyindex = self.state.bars['index'][-1]
-        self.state.ilog(e="send MARKET buy to if", msg="S:"+str(size), ltp=self.state.interface.get_last_price(self.state.symbol))
+        #self.state.ilog(e="send MARKET buy to if", msg="S:"+str(size), ltp=self.state.interface.get_last_price(self.state.symbol))
+        self.state.ilog(e="send MARKET buy to if", msg="S:"+str(size), ltp=self.state.bars['close'][-1])
         return self.state.interface.buy(size=sizer)
 
     #overidden methods
@@ -186,7 +187,8 @@ class StrategyClassicSL(Strategy):
 
         #self.state.blocksell = 1
         #self.state.vars.lastbuyindex = self.state.bars['index'][-1]
-        self.state.ilog(e="send MARKET SELL to if", msg="S:"+str(size), ltp=self.state.interface.get_last_price(self.state.symbol))
+        #self.state.ilog(e="send MARKET SELL to if", msg="S:"+str(size), ltp=self.state.interface.get_last_price(self.state.symbol))
+        self.state.ilog(e="send MARKET SELL to if", msg="S:"+str(size), ltp=self.state.bars['close'][-1])
         return self.state.interface.sell(size=size)
 
     async def get_limitka_price(self):