From b6d28db79df6680b8a5ad2e61df7beabc54b16e8 Mon Sep 17 00:00:00 2001 From: Rose Heart Date: Fri, 15 Nov 2024 16:37:26 +0000 Subject: [PATCH] This has been one of the more difficult bugs to track and trace. It is strictly related to Oanda and OliverTwist if tracking the presence of existing orders. I think I finally killed it once and for all. Version update. Changes to be committed: modified: Base/JackrabbitLocker modified: Base/JackrabbitOliverTwist modified: Base/JackrabbitRelay modified: Base/Library/JRRmimic.py modified: Base/Library/JackrabbitProxy.py modified: Base/Library/JackrabbitRelay.py modified: Base/Library/OliverTwist-oanda.py --- Base/JackrabbitLocker | 2 +- Base/JackrabbitOliverTwist | 2 +- Base/JackrabbitRelay | 2 +- Base/Library/JRRmimic.py | 2 +- Base/Library/JackrabbitProxy.py | 2 +- Base/Library/JackrabbitRelay.py | 2 +- Base/Library/OliverTwist-oanda.py | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Base/JackrabbitLocker b/Base/JackrabbitLocker index 17496fe..dc8e6be 100755 --- a/Base/JackrabbitLocker +++ b/Base/JackrabbitLocker @@ -28,7 +28,7 @@ import json import JRRsupport -Version="0.0.0.1.1015" +Version="0.0.0.1.1020" BaseDirectory='/home/JackrabbitRelay2/Base' ConfigDirectory='/home/JackrabbitRelay2/Config' LogDirectory="/home/JackrabbitRelay2/Logs" diff --git a/Base/JackrabbitOliverTwist b/Base/JackrabbitOliverTwist index adcd3db..676781e 100755 --- a/Base/JackrabbitOliverTwist +++ b/Base/JackrabbitOliverTwist @@ -67,7 +67,7 @@ import subprocess import JRRsupport import JackrabbitRelay as JRR -Version="0.0.0.1.1015" +Version="0.0.0.1.1020" BaseDirectory='/home/JackrabbitRelay2/Base' DataDirectory='/home/JackrabbitRelay2/Data' ConfigDirectory='/home/JackrabbitRelay2/Config' diff --git a/Base/JackrabbitRelay b/Base/JackrabbitRelay index b75f3af..d7ba7eb 100755 --- a/Base/JackrabbitRelay +++ b/Base/JackrabbitRelay @@ -16,7 +16,7 @@ import json import JRRsupport -Version="0.0.0.1.1015" +Version="0.0.0.1.1020" BaseDirectory='/home/JackrabbitRelay2/Base' ConfigDirectory='/home/JackrabbitRelay2/Config' LogDirectory="/home/JackrabbitRelay2/Logs" diff --git a/Base/Library/JRRmimic.py b/Base/Library/JRRmimic.py index 9858324..bf0b053 100755 --- a/Base/Library/JRRmimic.py +++ b/Base/Library/JRRmimic.py @@ -48,7 +48,7 @@ class mimic: # released at exit. def __init__(self,Exchange,Config,Active,DataDirectory=None): - self.Version="0.0.0.1.1015" + self.Version="0.0.0.1.1020" self.StableCoinUSD=['USDT','USDC','BUSD','UST','DAI','FRAX','TUSD', \ 'USDP','LUSD','USDN','HUSD','FEI','TRIBE','RSR','OUSD','XSGD', \ diff --git a/Base/Library/JackrabbitProxy.py b/Base/Library/JackrabbitProxy.py index 2fdf9b2..51a7fa2 100755 --- a/Base/Library/JackrabbitProxy.py +++ b/Base/Library/JackrabbitProxy.py @@ -50,7 +50,7 @@ class JackrabbitProxy: def __init__(self,framework=None,payload=None,exchange=None,account=None,asset=None,Usage=None): # All the default locations - self.Version="0.0.0.1.1015" + self.Version="0.0.0.1.1020" self.BaseDirectory='/home/JackrabbitRelay2/Base' self.ConfigDirectory='/home/JackrabbitRelay2/Config' self.DataDirectory="/home/JackrabbitRelay2/Data" diff --git a/Base/Library/JackrabbitRelay.py b/Base/Library/JackrabbitRelay.py index 4215c96..f274ca2 100755 --- a/Base/Library/JackrabbitRelay.py +++ b/Base/Library/JackrabbitRelay.py @@ -110,7 +110,7 @@ def Success(self,f,s): class JackrabbitRelay: def __init__(self,framework=None,payload=None,exchange=None,account=None,asset=None,secondary=None,NoIdentityVerification=False,Usage=None,RaiseError=False): # All the default locations - self.Version="0.0.0.1.1015" + self.Version="0.0.0.1.1020" self.NOhtml='NO!

NO!

' self.Directories={} self.Directories['Base']='/home/JackrabbitRelay2/Base' diff --git a/Base/Library/OliverTwist-oanda.py b/Base/Library/OliverTwist-oanda.py index 59c6a20..e07f31b 100755 --- a/Base/Library/OliverTwist-oanda.py +++ b/Base/Library/OliverTwist-oanda.py @@ -615,7 +615,7 @@ def CheckStopLoss(relay,Orphan,MarginStrike): def OrderProcessor(osh): StartTime=datetime.datetime.now() -# print("OP A") +# print("OP A:") # Split off the parts we need. idx=osh['IDX'] @@ -634,13 +634,12 @@ def OrderProcessor(osh): # shLock.Lock() try: - if not os.path.exists(idx): - return 'Waiting' - +# print("OP B1") OrphanList=ReadStorehouse(idx=idx) if len(OrphanList)==0: return 'Waiting' +# print("OP B2",len(OrphanList)) # Process conditional orders # For long positions, highestTrade will be closest to take profit, lowest for stop loss @@ -664,6 +663,7 @@ def OrderProcessor(osh): # Take profit starts at the lowest order priced and works upward for long. # Check take profit +# print("OP C") # print("OP C1",highestTrade) # print("OP C2",lowestTrade) if lowestTrade['Order']['Direction'].lower()=='long':