openfund-taker 2.1.6__py3-none-any.whl → 2.1.8__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. {openfund_taker-2.1.6.dist-info → openfund_taker-2.1.8.dist-info}/METADATA +1 -1
  2. {openfund_taker-2.1.6.dist-info → openfund_taker-2.1.8.dist-info}/RECORD +5 -5
  3. taker/SMCSLAndTPTaker.py +2 -2
  4. {openfund_taker-2.1.6.dist-info → openfund_taker-2.1.8.dist-info}/WHEEL +0 -0
  5. {openfund_taker-2.1.6.dist-info → openfund_taker-2.1.8.dist-info}/entry_points.txt +0 -0
{openfund_taker-2.1.6.dist-info → openfund_taker-2.1.8.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: openfund-taker
3
- Version: 2.1.6
3
+ Version: 2.1.8
4
4
  Summary: Openfund-taker
5
5
  Requires-Python: >=3.9,<4.0
6
6
  Classifier: Programming Language :: Python :: 3
{openfund_taker-2.1.6.dist-info → openfund_taker-2.1.8.dist-info}/RECORD RENAMED
@@ -1,5 +1,5 @@
1
1
  taker/MultiAssetOldTradingBot.py,sha256=uBh_BxglvcbaHIsWHM7GI9Qa_QjzsxXaXJAAWEOMO5c,15315
2
- taker/SMCSLAndTPTaker.py,sha256=ad8C94XKiJOdQxZw1vj7RI4iZhjwJ-CWkcpTWx6tRPY,21055
2
+ taker/SMCSLAndTPTaker.py,sha256=zz1Vz3SoYB3yJaEr3p0cz6PVoxt7690sN26QVfr2cSQ,21048
3
3
  taker/ThreeLineTradingTaker.py,sha256=ElD9pKDO4nxw5VKNRrvXqyiU0gkV_1Mg_zk-hftfaPs,20553
4
4
  taker/TrailingSLAndTPTaker.py,sha256=OPD1ZNqyM8jZ7Im-bWm_6Cu4_qfwKmNZ30XpbP6-l00,2746
5
5
  taker/TrailingSLTaker.py,sha256=dvKZ9x-uIq3hWuV_K_gpeDhdtoA99gk15X6z2xaPmbQ,47386
@@ -11,7 +11,7 @@ taker/chua_ok_all.py,sha256=2XnZM6QdB3juSE1pqQIJyh2x1XuhlTlnBKNA3owlJ9E,15267
11
11
  taker/chua_ok_bot.py,sha256=9SW0ujhi6PfN4yR1JZ9NaA37HtnXJ2QAWUfW52NG68w,13109
12
12
  taker/config.py,sha256=YPxghO5i0vgRg9Cja8kGj9O7pgSbbtzOgf3RexqXXwY,1188
13
13
  taker/main.py,sha256=Ulz22BV34Mp8ugh-Dior1mIS8n8si8bMi5RCBit2G4U,2774
14
- openfund_taker-2.1.6.dist-info/METADATA,sha256=wDw3ROeF31iYuSNfBfnsnOqXq7ijPdUvMeRnEMsvnZw,7527
15
- openfund_taker-2.1.6.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
16
- openfund_taker-2.1.6.dist-info/entry_points.txt,sha256=a7mG8F7aOA5-Gk2vPWuAR4537faxaHUgM_jwIDBZoEc,50
17
- openfund_taker-2.1.6.dist-info/RECORD,,
14
+ openfund_taker-2.1.8.dist-info/METADATA,sha256=Z9W0Yzjq9rUIn-binxzum4M5NLaqzEqSbccrzuJCY6s,7527
15
+ openfund_taker-2.1.8.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
16
+ openfund_taker-2.1.8.dist-info/entry_points.txt,sha256=a7mG8F7aOA5-Gk2vPWuAR4537faxaHUgM_jwIDBZoEc,50
17
+ openfund_taker-2.1.8.dist-info/RECORD,,
taker/SMCSLAndTPTaker.py CHANGED
@@ -364,7 +364,7 @@ class SMCSLAndTPTaker(TrailingSLTaker):
364
364
 
365
365
  # sl_price = self.global_symbol_stop_loss_price.get(symbol, float(position['markPrice']))
366
366
  entry_price = float(position['entryPrice'])
367
- sl_price = self.calculate_sl_price_by_pct(symbol, position['side'], stop_loss_pct)
367
+ sl_price = self.calculate_sl_price_by_pct(symbol, position, stop_loss_pct)
368
368
  threshold = 0.0
369
369
  if is_buy and sl_price > 0 :
370
370
  threshold = float(self.round_price_to_tick(symbol, (entry_price - sl_price ) * tp_sl_ratio + entry_price))
@@ -414,7 +414,7 @@ class SMCSLAndTPTaker(TrailingSLTaker):
414
414
  """
415
415
  # 如果已经触发过全局止盈，则跳过
416
416
  if self.global_symbol_take_profit_flag.get(symbol, False):
417
- self.logger.info(f"{symbol}: 已经设置过全局止盈 tp_price={self.global_symbol_take_profit_price[symbol]}")
417
+ self.logger.info(f"{symbol} : 已经设置过全局止盈 tp_price={self.global_symbol_take_profit_price[symbol]}")
418
418
  return
419
419
 
420
420
  smc_strategy = pair_config.get('smc_strategy',{})