From 21d0eebbbb9d220b267f0d903e32d3579f80b104 Mon Sep 17 00:00:00 2001 From: Rose Heart Date: Tue, 26 Mar 2024 14:41:45 +0000 Subject: [PATCH] Mimic wallet bug fixes. Direction operation confusion sorted. Any value moving from quote to base is a buy (long or short), while any value moving from base to quote is a sell. Quote is ALWAYS >= 0 or account is liquidated. Version updated. 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: Extras/Mimic/WalletInspect --- Base/JackrabbitLocker | 2 +- Base/JackrabbitOliverTwist | 2 +- Base/JackrabbitRelay | 2 +- Base/Library/JRRmimic.py | 14 ++++---------- Base/Library/JackrabbitProxy.py | 2 +- Base/Library/JackrabbitRelay.py | 2 +- Extras/Mimic/WalletInspect | 5 ++++- 7 files changed, 13 insertions(+), 16 deletions(-) diff --git a/Base/JackrabbitLocker b/Base/JackrabbitLocker index c8d72d0..df5ff38 100755 --- a/Base/JackrabbitLocker +++ b/Base/JackrabbitLocker @@ -28,7 +28,7 @@ import json import JRRsupport -Version="0.0.0.1.780" +Version="0.0.0.1.785" BaseDirectory='/home/JackrabbitRelay2/Base' ConfigDirectory='/home/JackrabbitRelay2/Config' LogDirectory="/home/JackrabbitRelay2/Logs" diff --git a/Base/JackrabbitOliverTwist b/Base/JackrabbitOliverTwist index f332a00..4458d00 100755 --- a/Base/JackrabbitOliverTwist +++ b/Base/JackrabbitOliverTwist @@ -40,7 +40,7 @@ import subprocess import JRRsupport import JackrabbitRelay as JRR -Version="0.0.0.1.780" +Version="0.0.0.1.785" BaseDirectory='/home/JackrabbitRelay2/Base' DataDirectory='/home/JackrabbitRelay2/Data' ConfigDirectory='/home/JackrabbitRelay2/Config' diff --git a/Base/JackrabbitRelay b/Base/JackrabbitRelay index 55de90f..b3cbe25 100755 --- a/Base/JackrabbitRelay +++ b/Base/JackrabbitRelay @@ -16,7 +16,7 @@ import json import JRRsupport -Version="0.0.0.1.780" +Version="0.0.0.1.785" 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 10d28c8..1064546 100644 --- 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.780" + self.Version="0.0.0.1.785" self.StableCoinUSD=['USDT','USDC','BUSD','UST','DAI','FRAX','TUSD', \ 'USDP','LUSD','USDN','HUSD','FEI','TRIBE','RSR','OUSD','XSGD', \ @@ -271,16 +271,11 @@ def LiquidateWallet(self,asset,fee_rate=0): else: self.Wallet['Wallet'][quote]=total_proceeds # Initialize quote currency balance if not present - # Figure out liquidation direction - if amount>0: - action='sell' - else: - action='buy' # Update successful order={} order['DateTime']=(datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')) order['ID']=f"{time.time()*10000000:.0f}" - order['Action']=action + order['Action']='sell' order['Asset']=asset order[base]=self.Wallet['Wallet'][base] order[quote]=self.Wallet['Wallet'][quote] @@ -430,9 +425,8 @@ def UpdateWallet(self,action,asset,amount,price,fee_rate=0): # CRITICAL: - # For position fliping - # if b>0, a<0: sell base, buy amount - # if b<0, a>0: buy bbase, sell amount + # Any value moving from quote to base is a buy. + # Any value moving from base to quote is a sell. def PlaceOrder(self,**kwargs): pair=kwargs.get('pair') diff --git a/Base/Library/JackrabbitProxy.py b/Base/Library/JackrabbitProxy.py index fad3ee4..bd72e23 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.780" + self.Version="0.0.0.1.785" 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 f9002cd..49b4f0f 100755 --- a/Base/Library/JackrabbitRelay.py +++ b/Base/Library/JackrabbitRelay.py @@ -106,7 +106,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): # All the default locations - self.Version="0.0.0.1.780" + self.Version="0.0.0.1.785" self.NOhtml='NO!

NO!

' self.BaseDirectory='/home/JackrabbitRelay2/Base' self.ConfigDirectory='/home/JackrabbitRelay2/Config' diff --git a/Extras/Mimic/WalletInspect b/Extras/Mimic/WalletInspect index 710c736..1ff6128 100755 --- a/Extras/Mimic/WalletInspect +++ b/Extras/Mimic/WalletInspect @@ -60,7 +60,10 @@ for line in lines: f=float(data['Fee']) if act=='B': - cnr-=abs(p*a) + if bw!=0: + cnr-=abs(p*a) + else: + cnr+=abs(p*a) elif act=='S': cnr+=abs(p*a)