Skip to content

Commit 127a6a0

Browse files
rapmd73rapmd73
committed
Bug fix in spread limiting. Please be sure to run **UpdatePlaceOrder** with ALL of
your exchanges/brokers. Version update. Changes to be committed: modified: Base/CCXT-PlaceOrder.future modified: Base/CCXT-PlaceOrder.margin modified: Base/CCXT-PlaceOrder.spot modified: Base/CCXT-PlaceOrder.swap 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/OANDA-PlaceOrder
1 parent 3f53d51 commit 127a6a0

12 files changed

+20
-18
lines changed

‎Base/CCXT-PlaceOrder.future

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,12 @@ def main():
143143

144144
if 'Spread' in relay.Active:
145145
if ticker['Spread']>=float(relay.Active['Spread']):
146-
s=f"too large, {spread:.8f} > {relay.Active['Spread']:.8f}"
146+
s=f"too large, {ticker['Spread']:.8f} > {float(relay.Active['Spread']):.8f}"
147147
relay.JRLog.Error("Spread", s)
148148

149149
if 'Spread' in relay.Order:
150150
if ticker['Spread']>=float(relay.Order['Spread']):
151-
s=f"too large, {spread:.8f} > {relay.Order['Spread']:.8f}"
151+
s=f"too large, {ticker['Spread']:.8f} > {float(relay.Order['Spread']):.8f}"
152152
relay.JRLog.Error("Spread", s)
153153

154154
# Check for maximum allowed assets

‎Base/CCXT-PlaceOrder.margin

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,12 @@ def main():
143143

144144
if 'Spread' in relay.Active:
145145
if ticker['Spread']>=float(relay.Active['Spread']):
146-
s=f"too large, {spread:.8f} > {relay.Active['Spread']:.8f}"
146+
s=f"too large, {ticker['Spread']:.8f} > {float(relay.Active['Spread']):.8f}"
147147
relay.JRLog.Error("Spread", s)
148148

149149
if 'Spread' in relay.Order:
150150
if ticker['Spread']>=float(relay.Order['Spread']):
151-
s=f"too large, {spread:.8f} > {relay.Order['Spread']:.8f}"
151+
s=f"too large, {ticker['Spread']:.8f} > {float(relay.Active['Spread']):.8f}"
152152
relay.JRLog.Error("Spread", s)
153153

154154
# Check for maximum allowed assets

‎Base/CCXT-PlaceOrder.spot

+2-2
Original file line numberDiff line numberDiff line change
@@ -152,12 +152,12 @@ def main():
152152

153153
if 'Spread' in relay.Active:
154154
if ticker['Spread']>=float(relay.Active['Spread']):
155-
s=f"too large, {spread:.8f} > {relay.Active['Spread']:.8f}"
155+
s=f"too large, {ticker['Spread']:.8f} > {float(relay.Active['Spread']):.8f}"
156156
relay.JRLog.Error("Spread", s)
157157

158158
if 'Spread' in relay.Order:
159159
if ticker['Spread']>=float(relay.Order['Spread']):
160-
s=f"too large, {spread:.8f} > {relay.Order['Spread']:.8f}"
160+
s=f"too large, {ticker['Spread']:.8f} > {float(relay.Active['Spread']):.8f}"
161161
relay.JRLog.Error("Spread", s)
162162

163163
# Check for maximum allowed assets

‎Base/CCXT-PlaceOrder.swap

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,12 @@ def main():
143143

144144
if 'Spread' in relay.Active:
145145
if ticker['Spread']>=float(relay.Active['Spread']):
146-
s=f"too large, {spread:.8f} > {relay.Active['Spread']:.8f}"
146+
s=f"too large, {ticker['Spread']:.8f} > {float(relay.Active['Spread']):.8f}"
147147
relay.JRLog.Error("Spread", s)
148148

149149
if 'Spread' in relay.Order:
150150
if ticker['Spread']>=float(relay.Order['Spread']):
151-
s=f"too large, {spread:.8f} > {relay.Order['Spread']:.8f}"
151+
s=f"too large, {ticker['Spread']:.8f} > {float(relay.Active['Spread']):.8f}"
152152
relay.JRLog.Error("Spread", s)
153153

154154
# Check for maximum allowed assets

‎Base/JackrabbitLocker

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import json
2828

2929
import JRRsupport
3030

31-
Version="0.0.0.1.1050"
31+
Version="0.0.0.1.1055"
3232
BaseDirectory='/home/JackrabbitRelay2/Base'
3333
ConfigDirectory='/home/JackrabbitRelay2/Config'
3434
LogDirectory="/home/JackrabbitRelay2/Logs"

‎Base/JackrabbitOliverTwist

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ import subprocess
6767
import JRRsupport
6868
import JackrabbitRelay as JRR
6969

70-
Version="0.0.0.1.1050"
70+
Version="0.0.0.1.1055"
7171
BaseDirectory='/home/JackrabbitRelay2/Base'
7272
DataDirectory='/home/JackrabbitRelay2/Data'
7373
ConfigDirectory='/home/JackrabbitRelay2/Config'

‎Base/JackrabbitRelay

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import json
1616

1717
import JRRsupport
1818

19-
Version="0.0.0.1.1050"
19+
Version="0.0.0.1.1055"
2020
BaseDirectory='/home/JackrabbitRelay2/Base'
2121
ConfigDirectory='/home/JackrabbitRelay2/Config'
2222
LogDirectory="/home/JackrabbitRelay2/Logs"

‎Base/Library/JRRmimic.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class mimic:
4848
# released at exit.
4949

5050
def __init__(self,Exchange,Config,Active,DataDirectory=None):
51-
self.Version="0.0.0.1.1050"
51+
self.Version="0.0.0.1.1055"
5252

5353
self.StableCoinUSD=['USDT','USDC','BUSD','UST','DAI','FRAX','TUSD', \
5454
'USDP','LUSD','USDN','HUSD','FEI','TRIBE','RSR','OUSD','XSGD', \

‎Base/Library/JackrabbitProxy.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
class JackrabbitProxy:
5151
def __init__(self,framework=None,payload=None,exchange=None,account=None,asset=None,Usage=None):
5252
# All the default locations
53-
self.Version="0.0.0.1.1050"
53+
self.Version="0.0.0.1.1055"
5454
self.BaseDirectory='/home/JackrabbitRelay2/Base'
5555
self.ConfigDirectory='/home/JackrabbitRelay2/Config'
5656
self.DataDirectory="/home/JackrabbitRelay2/Data"

‎Base/Library/JackrabbitRelay.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def Success(self,f,s):
110110
class JackrabbitRelay:
111111
def __init__(self,framework=None,payload=None,exchange=None,account=None,asset=None,secondary=None,NoIdentityVerification=False,Usage=None,RaiseError=False):
112112
# All the default locations
113-
self.Version="0.0.0.1.1050"
113+
self.Version="0.0.0.1.1055"
114114
self.NOhtml='<html><title>NO!</title><body style="background-color:#ffff00;display:flex;weight:100vw;height:100vh;align-items:center;justify-content:center"><h1 style="color:#ff0000;font-weight:1000;font-size:10rem">NO!</h1></body></html>'
115115
self.Directories={}
116116
self.Directories['Base']='/home/JackrabbitRelay2/Base'

‎Base/OANDA-PlaceOrder

+5-4
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,8 @@ def main():
175175
relay.JRLog.Write('PlaceOrder OANDA '+relay.Version)
176176

177177
# Make sure conditional orders with any action other the BUY are ignored
178-
# This is neccessary for TradingView strategies or any framework where 1 alret handles both buying and selling.
178+
# This is neccessary for TradingView strategies or any framework where 1 alret
179+
# handles both buying and selling.
179180

180181
# This works bcause OANDA allows buying short with negative unit numbers.
181182

@@ -226,12 +227,12 @@ def main():
226227

227228
if 'Spread' in relay.Active:
228229
if ticker['Spread']>=float(relay.Active['Spread']):
229-
s=f"too large, {spread:.8f} > {relay.Active['Spread']:.8f}"
230-
relay.JRLog.Error("Spread", s)
230+
s=f"too large, {ticker['Spread']:.4f} > {float(relay.Active['Spread']):.4f}"
231+
relay.JRLog.Error(f"Spread", s)
231232

232233
if 'Spread' in relay.Order:
233234
if ticker['Spread']>=float(relay.Order['Spread']):
234-
s=f"too large, {spread:.8f} > {relay.Order['Spread']:.8f}"
235+
s=f"too large, {ticker['Spread']:.4f} > {float(relay.Order['Spread']):.4f}"
235236
relay.JRLog.Error("Spread", s)
236237

237238
# Check for maximum allowed assets

‎Base/X1

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
s=f"too large, {ticker['Spread']:.8f} > {float(relay.Active['Spread']):.8f}"

0 commit comments

Comments
 (0)