Bug fixes in order failed responses.

Bug fixed in Oanda percentage based unit sizes when PCT table overrides (rare situation) are used.

Changes to be committed:
	modified:   Base/Library/CONDccxt.py
	modified:   Base/Library/CONDoanda.py
	modified:   Base/Library/JRRccxt.py
	modified:   Base/Library/JRRoanda.py
	modified:   Base/OANDA-PlaceOrder

Author: rapmd73

Base/Library/CONDccxt.py

@@ -210,3 +210,4 @@ def OrderProcessor(Orphan):
         # Something went wrong
         relay.JRLog.Write(f"{Orphan['Key']}: Code Error - {sys.exc_info()[-1].tb_lineno}/{str(e)}",stdOut=False)
         return 'Waiting'
+

Base/Library/CONDoanda.py

@@ -306,12 +306,11 @@ def OrderProcessor(Orphan):
 
                     # Order must be closed as it succedded
                     newOrder['ID']=oid
-                    relay.WriteLedger(Order=newOrder,Response=result)
+                    relay.WriteLedger(Order=newOrder,Response=None)
                     return 'Delete'
                 else:
                     # Give OliverTwist a response
                     relay.JRLog.Write(f"{id} -> {cid}: Order failed with {relay.GetFailedReason(result)}",stdOut=False)
-                    relay.JRLog.Write(f"{id} -> {cid}: {result}",stdOut=False)
                     return 'Waiting'
             else:
                 # Strike did not happen

Base/Library/JRRccxt.py

@@ -730,6 +730,11 @@ def WriteLedger(self,**kwargs):
         IsLog=kwargs.get('Log')
         LedgerDirectory=kwargs.get('LedgerDirectory')
 
+        if type(Order) is str:
+            Order=json.loads(Order)
+        if type(Response) is str:
+            Response=json.loads(Response)
+
         if Response!=None:
             Response.pop('Identity',None)
             id=Response['id']
@@ -798,3 +803,5 @@ def FindLedgerID(self,**kwargs):
 
         fh.close()
         return data['Detail']
+
+

Base/Library/JRRoanda.py

@@ -584,48 +584,57 @@ def WriteLedger(self,**kwargs):
         IsLog=kwargs.get('Log')
         LedgerDirectory=kwargs.get('LedgerDirectory')
 
-        if 'ID' in Order:
-            Order.pop('Identity',None)
-            id=Order['ID']
-        if Response!=None:
-            Response.pop('Identity',None)
-            if 'orderCreateTransaction' in Response:
-                id=Response['orderCreateTransaction']['id']
-            elif 'longOrderCreateTransaction' in Response:
-                id=Response['longOrderCreateTransaction']['id']
-            elif 'shortOrderCreateTransaction' in Response:
-                id=Response['shortOrderCreateTransaction']['id']
-
-        detail=self.GetOrderDetails(OrderID=id)
-
-        ledger={}
-        ledger['DateTime']=(datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f'))
-        ledger['ID']=id
-        ledger['Order']=Order
-        if Response!=None:
-            ledger['Response']=Response
-        ledger['Detail']=detail
-
-        # We need the embedded order reference if comming from OliverTwist
-        if 'Order' in Order:
-            subOrder=json.loads(Order['Order'])
-        else:
-            subOrder=Order
-        if subOrder['Exchange']!=None and subOrder['Account']!=None and subOrder['Asset']!=None:
-            fname=subOrder['Exchange']+'.'+subOrder['Account']+'.'+subOrder['Asset']
-            fname=fname.replace('/','').replace('-','').replace(':','').replace(' ','')
-            lname=LedgerDirectory+'/'+fname+'.ledger'
-
-            # Strip Identity
-            ledger.pop('Identity',None)
-
-            ledgerLock=JRRsupport.Locker(lname)
-            ledgerLock.Lock()
-            JRRsupport.AppendFile(lname,json.dumps(ledger)+'\n')
-            ledgerLock.Unlock()
-
-            if type(IsLog)==bool and IsLog==True:
-                self.Log.Write(f"Ledgered: {subOrder['Exchange']}:{id}",stdOut=False)
+        if type(Order) is str:
+            Order=json.loads(Order)
+        if type(Response) is str:
+            Response=json.loads(Response)
+
+        try:
+            if 'ID' in Order:
+                Order.pop('Identity',None)
+                id=Order['ID']
+            if Response!=None:
+                Response.pop('Identity',None)
+                if 'orderCreateTransaction' in Response:
+                    id=Response['orderCreateTransaction']['id']
+                elif 'longOrderCreateTransaction' in Response:
+                    id=Response['longOrderCreateTransaction']['id']
+                elif 'shortOrderCreateTransaction' in Response:
+                    id=Response['shortOrderCreateTransaction']['id']
+
+            detail=self.GetOrderDetails(OrderID=id)
+
+            ledger={}
+            ledger['DateTime']=(datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f'))
+            ledger['ID']=id
+            ledger['Order']=Order
+            if Response!=None:
+                ledger['Response']=Response
+            ledger['Detail']=detail
+
+            # We need the embedded order reference if comming from OliverTwist
+            if 'Order' in Order:
+                subOrder=json.loads(Order['Order'])
+            else:
+                subOrder=Order
+            if subOrder['Exchange']!=None and subOrder['Account']!=None and subOrder['Asset']!=None:
+                fname=subOrder['Exchange']+'.'+subOrder['Account']+'.'+subOrder['Asset']
+                fname=fname.replace('/','').replace('-','').replace(':','').replace(' ','')
+                lname=LedgerDirectory+'/'+fname+'.ledger'
+
+                # Strip Identity
+                if 'Identity' in ledger:
+                    ledger.pop('Identity',None)
+
+                ledgerLock=JRRsupport.Locker(lname)
+                ledgerLock.Lock()
+                JRRsupport.AppendFile(lname,json.dumps(ledger)+'\n')
+                ledgerLock.Unlock()
+
+                if type(IsLog)==bool and IsLog==True:
+                    self.Log.Write(f"Ledgered: {subOrder['Exchange']}:{id}",stdOut=False)
+        except Exception as err:
+            self.Log.Write(f"WriteLedger Code Error - {sys.exc_info()[-1].tb_lineno}/{str(err)}",stdOut=False)
 
     # Read ledger entry and locate by ID
 

Base/OANDA-PlaceOrder

@@ -43,14 +43,15 @@ def GetPCTamount(relay,close):
     else:
         expire=(3650*86400)
 
+    bal=relay.GetBalance()
+    mr=float(relay.Markets[relay.Asset]['marginRate'])
+
     # OverridePCTtable should probably be the default state for OliverTwist, since each trade is
     # independant. For now though, I am going to not make this default as a safety protocol to keep trades
     # linear and controlled. User can override this, but that really is the point. The user MUST take action
     # to override the saety layers.
 
     if "OverridePCTtable" not in relay.Active and "OverridePCTtable" not in relay.Order:
-        bal=relay.GetBalance()
-        mr=float(relay.Markets[relay.Asset]['marginRate'])
         pct,PCTtype=GetPCTtype(relay.Order['Units'])
         amount,volume=GetPCTvalue(pct,close,bal,mr)
 
@@ -69,9 +70,8 @@ def GetPCTamount(relay,close):
         if (pct<0 and amount>0) or (pct>0 and amount<0):
             amount=amount*-1
     else:
-        bal=relay.GetBalance()
-        mr=float(relay.Markets[relay.Asset]['marginRate'])
-        amount=round((((float(relay.Order[currency].replace('%',''))/100)*bal)/close)/mr,8)
+        pct=float(relay.Order['Units'].replace('%',''))/100
+        amount=round(((pct*bal)/close)/mr,8)
     return amount
 
 # Find the lowest lot size used in the list of open trades. This is a good way to make