Skip to content

Commit 94ca5c6

Browse files
committed
**IMPORTANT**: run ./UpdatePlaceOrder for ALL of your exchanges/brokers.
Fixed bug in ticker spread rounding. Fixed typos. Version update. Changes to be committed: modified: Base/CCXT-PlaceOrder.future modified: Base/CCXT-PlaceOrder.margin modified: Base/CCXT-PlaceOrder.swap modified: Base/JackrabbitLocker modified: Base/JackrabbitOliverTwist modified: Base/JackrabbitRelay modified: Base/Library/JRRccxt.py modified: Base/Library/JRRmimic.py modified: Base/Library/JackrabbitProxy.py modified: Base/Library/JackrabbitRelay.py modified: Extras/CodeProofs/readTicker
1 parent 127a6a0 commit 94ca5c6

12 files changed

+14
-15
lines changed

Base/CCXT-PlaceOrder.future

+2-2
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ def main():
311311
try:
312312
if "set_leverage" in relay.Broker and "Leverage" in relay.Order:
313313
relay.Broker.set_leverage(relay.Order['Leverage'],relay.Order['Asset'])
314-
relay.JRLog.Write("|- Leverage: "+Order['Leverage'])
314+
relay.JRLog.Write("|- Leverage: "+relay.Order['Leverage'])
315315
except:
316316
pass
317317

@@ -320,7 +320,7 @@ def main():
320320
try: # Isolated or Crossed
321321
if "set_margin_mode" in relay.Broker and "Margin" in relay.Order:
322322
relay.Broker.set_margin_mode(relay.Order['Asset'],relay.Order['Margin'].upper())
323-
relay.JRLog.Write("|- Margin: "+Order['Margin'])
323+
relay.JRLog.Write("|- Margin: "+relay.Order['Margin'])
324324
except:
325325
pass
326326

Base/CCXT-PlaceOrder.margin

+2-2
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ def main():
309309
try:
310310
if "set_leverage" in relay.Broker and "Leverage" in relay.Order:
311311
relay.Broker.set_leverage(relay.Order['Leverage'],relay.Order['Asset'])
312-
relay.JRLog.Write("|- Leverage: "+Order['Leverage'])
312+
relay.JRLog.Write("|- Leverage: "+relay.Order['Leverage'])
313313
except:
314314
pass
315315

@@ -318,7 +318,7 @@ def main():
318318
try: # Isolated or Crossed
319319
if "set_margin_mode" in relay.Broker and "Margin" in relay.Order:
320320
relay.Broker.set_margin_mode(relay.Order['Asset'],relay.Order['Margin'].upper())
321-
relay.JRLog.Write("|- Margin: "+Order['Margin'])
321+
relay.JRLog.Write("|- Margin: "+relay.Order['Margin'])
322322
except:
323323
pass
324324

Base/CCXT-PlaceOrder.swap

+2-2
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ def main():
311311
try:
312312
if "set_leverage" in relay.Broker and "Leverage" in relay.Order:
313313
relay.Broker.set_leverage(relay.Order['Leverage'],relay.Order['Asset'])
314-
relay.JRLog.Write("|- Leverage: "+Order['Leverage'])
314+
relay.JRLog.Write("|- Leverage: "+relay.Order['Leverage'])
315315
except:
316316
pass
317317

@@ -320,7 +320,7 @@ def main():
320320
try: # Isolated or Crossed
321321
if "set_margin_mode" in relay.Broker and "Margin" in relay.Order:
322322
relay.Broker.set_margin_mode(relay.Order['Asset'],relay.Order['Margin'].upper())
323-
relay.JRLog.Write("|- Margin: "+Order['Margin'])
323+
relay.JRLog.Write("|- Margin: "+relay.Order['Margin'])
324324
except:
325325
pass
326326

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.1055"
31+
Version="0.0.0.1.1060"
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.1055"
70+
Version="0.0.0.1.1060"
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.1055"
19+
Version="0.0.0.1.1060"
2020
BaseDirectory='/home/JackrabbitRelay2/Base'
2121
ConfigDirectory='/home/JackrabbitRelay2/Config'
2222
LogDirectory="/home/JackrabbitRelay2/Logs"

Base/Library/JRRccxt.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ def GetTicker(self,**kwargs):
363363
Pair['DateTime']=datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')
364364
Pair['Ask']=min(ask,bid)
365365
Pair['Bid']=max(bid,ask)
366-
Pair['Spread']=round(abs(Pair['Bid']-Pair['Ask']),8)
366+
Pair['Spread']=Pair['Bid']-Pair['Ask']
367367

368368
return Pair
369369

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.1055"
51+
self.Version="0.0.0.1.1060"
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.1055"
53+
self.Version="0.0.0.1.1060"
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.1055"
113+
self.Version="0.0.0.1.1060"
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/X1

-1
This file was deleted.

Extras/CodeProofs/readTicker

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ markets=relay.GetMarkets()
2929

3030
while True:
3131
ticker=relay.GetTicker(symbol=asset)
32-
print(ticker)
32+
print(f"{ticker['DateTime']} {ticker['Ask']:.8f} {ticker['Spread']:.8f} {ticker['Bid']:.8f}")
3333

0 commit comments

Comments
 (0)