diff --git a/Base/CCXT-PlaceOrder.spot b/Base/CCXT-PlaceOrder.spot index be37194..5ed0041 100755 --- a/Base/CCXT-PlaceOrder.spot +++ b/Base/CCXT-PlaceOrder.spot @@ -16,6 +16,7 @@ import sys sys.path.append('/home/JackrabbitRelay2/Base/Library') import os +import math import json import JRRsupport diff --git a/Base/JackrabbitLocker b/Base/JackrabbitLocker index 16d031d..5ce90ee 100755 --- a/Base/JackrabbitLocker +++ b/Base/JackrabbitLocker @@ -28,7 +28,7 @@ import json import JRRsupport -Version="0.0.0.1.995" +Version="0.0.0.1.1000" BaseDirectory='/home/JackrabbitRelay2/Base' ConfigDirectory='/home/JackrabbitRelay2/Config' LogDirectory="/home/JackrabbitRelay2/Logs" diff --git a/Base/JackrabbitOliverTwist b/Base/JackrabbitOliverTwist index 19c7f68..467c96b 100755 --- a/Base/JackrabbitOliverTwist +++ b/Base/JackrabbitOliverTwist @@ -60,7 +60,7 @@ import subprocess import JRRsupport import JackrabbitRelay as JRR -Version="0.0.0.1.995" +Version="0.0.0.1.1000" BaseDirectory='/home/JackrabbitRelay2/Base' DataDirectory='/home/JackrabbitRelay2/Data' ConfigDirectory='/home/JackrabbitRelay2/Config' diff --git a/Base/JackrabbitRelay b/Base/JackrabbitRelay index 753a1e9..7794d15 100755 --- a/Base/JackrabbitRelay +++ b/Base/JackrabbitRelay @@ -16,7 +16,7 @@ import json import JRRsupport -Version="0.0.0.1.995" +Version="0.0.0.1.1000" BaseDirectory='/home/JackrabbitRelay2/Base' ConfigDirectory='/home/JackrabbitRelay2/Config' LogDirectory="/home/JackrabbitRelay2/Logs" diff --git a/Base/Library/JRRccxt.py b/Base/Library/JRRccxt.py index 5dba337..4508796 100755 --- a/Base/Library/JRRccxt.py +++ b/Base/Library/JRRccxt.py @@ -436,9 +436,7 @@ def PlaceOrder(self,**kwargs): params['reduce_only']=ro if 'binance' in self.Broker.id: - params['quoteOrderQty']=amount -# else: -# amount=float(amount) + params['quoteOrderQty']=amount*price # Pure market orders break (phemex) when price in included. if m=='market' and "createMarketBuyOrderRequiresPrice" not in self.Broker.options: @@ -490,7 +488,7 @@ def GetMinimum(self,**kwargs): if diagnostics: self.Log.Write("Minimum asset analysis") - self.Log.Write("|- Base: "+base) +# self.Log.Write("|- Base: "+base) self.Log.Write(f"| |- Minimum: {minimum:.8f}") self.Log.Write(f"| |- Min Cost: {mincost:.8f}") @@ -498,16 +496,17 @@ def GetMinimum(self,**kwargs): # for the overhead of pulling quote currency. Quote currency # OVERRIDES base ALWAYS. - self.Log.Write("|- Quote: "+quote) +# self.Log.Write("|- Quote: "+quote) - if quote not in self.StableCoinUSD or forceQuote: - bpair=self.FindMatchingPair(quote) - if bpair!=None: - minimum,mincost=self.GetAssetMinimum(bpair,diagnostics) +# if quote not in self.StableCoinUSD or forceQuote: +# bpair=self.FindMatchingPair(quote) +# if bpair!=None: +# minimum,mincost=self.GetAssetMinimum(bpair,diagnostics) - if diagnostics: - self.Log.Write(f"| |- Minimum: {minimum:.8f}") - self.Log.Write(f"| |- Min Cost: {mincost:.8f}") +# if diagnostics: +# self.Log.Write("|- Quote: "+quote) +# self.Log.Write(f"| |- Minimum: {minimum:.8f}") +# self.Log.Write(f"| |- Min Cost: {mincost:.8f}") if minimum==0.0: self.Log.Error("Asset Analysis","minimum position size returned as 0") @@ -525,7 +524,7 @@ def GetAssetMinimum(self,pair,diagnostics): # This is the lowest accepted price of market order - close=ticker['Ask'] + close=max(ticker['Ask'],ticker['Bid']) # Check if there is an overide in place @@ -579,7 +578,7 @@ def GetAssetMinimum(self,pair,diagnostics): minimum=float('0.'+str(z[:factor-1])+'1') mincost=minimum*close - if 'binance' in self.Broker.id: + if 'binance' in exchangeName: # self.Broker.id: mincost+=0.3 minimum=mincost/close diff --git a/Base/Library/JRRmimic.py b/Base/Library/JRRmimic.py index 5fe28a4..df749be 100755 --- a/Base/Library/JRRmimic.py +++ b/Base/Library/JRRmimic.py @@ -45,7 +45,7 @@ class mimic: # placed in init and released at exit. def __init__(self,Exchange,Config,Active,DataDirectory=None): - self.Version="0.0.0.1.995" + self.Version="0.0.0.1.1000" 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 f52cdb8..79c06a8 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.995" + self.Version="0.0.0.1.1000" 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 ab7a5fb..42aaf76 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.995" + self.Version="0.0.0.1.1000" self.NOhtml='NO!

NO!

' self.Directories={} self.Directories['Base']='/home/JackrabbitRelay2/Base' diff --git a/Extras/CodeProofs/findMinCost b/Extras/CodeProofs/findMinCost index f935cac..8021d7a 100755 --- a/Extras/CodeProofs/findMinCost +++ b/Extras/CodeProofs/findMinCost @@ -24,8 +24,9 @@ else: print("An exchange, (sub)account, and an asset must be provided.") sys.exit(1) +print(relay.Markets[asset]['precision']) minimum,mincost=relay.GetMinimum(symbol=asset) print(f"Minimum Amount/Units: {minimum:16.8f}") -print(f"Minimum Cost: {mincost:16.8f}") +print(f"Minimum Cost: {mincost:16.8f}")