From 233ecad8b8710cb147268f22fc4c4bf1eb1f372f Mon Sep 17 00:00:00 2001
From: aazhou <aazhou@protonmail.com>
Date: Sat, 17 Jun 2023 08:24:59 +0800
Subject: [PATCH] fix bug

---
 settings.py             |  2 +-
 strategy/large_trans.py | 28 ++++++++++++++++++----------
 strategy_test.py        |  7 ++++++-
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/settings.py b/settings.py
index 37a78d5..20d5dae 100644
--- a/settings.py
+++ b/settings.py
@@ -17,4 +17,4 @@ oklink_api_headers = {
 
 #whaleAlert
 whaleAlert_apikey='gPkElMPR8Hpe5LxjKisR4YSFzxRxMLj6'
-whaleAlert_max_limit = os.getenv('TQ_WHALEALERT_MAX_USD_AMOUNT',2000 * 20000)
\ No newline at end of file
+whaleAlert_max_limit = os.getenv('TQ_WHALEALERT_MAX_USD_AMOUNT',1000 * 10000)
\ No newline at end of file
diff --git a/strategy/large_trans.py b/strategy/large_trans.py
index 3a1a2a1..484065b 100644
--- a/strategy/large_trans.py
+++ b/strategy/large_trans.py
@@ -4,23 +4,31 @@ import settings
 from datetime import datetime, timedelta
 import time
 import tg
+import traceback
+import logging
+
 
 
 def strategy_run():
     # 获取上一分钟的timestamp
-    last_min = datetime.now() - timedelta(minutes=1)
+    last_min = datetime.now() - timedelta(minutes=5)
     ts = time.mktime(last_min.timetuple())
 
     url = f'https://api.whale-alert.io/v1/transactions?api_key={settings.whaleAlert_apikey}&start={int(ts)}'
     resp = requests.get(url).json()
+    print(resp)
+    try:
+        if 'transactions' in resp:
+            data = resp['transactions']
 
-    data = resp['transactions']
-    
-    for ts in data:
-        usd = int(ts['amount_usd'])
-        if ts['to']['owner_type'] == 'exchange' and ts['from']['owner_type'] == 'unknown' and usd > settings.whaleAlert_max_limit:
-            from_text = 'unknown wallet'
-            content = f"🚨 {ts['amount']} #{ts['symbol']} ({ts['amount_usd']} USD) 从 {from_text} 转入 #{ts['to']['owner']}"
+            for ts in data:
+                usd = int(ts['amount_usd'])
+                if ts['to']['owner_type'] == 'exchange' and usd > settings.whaleAlert_max_limit:
+                    from_text = 'unknown wallet'
+                    content = f"🚨 {ts['amount']} #{ts['symbol']} ({ts['amount_usd']} USD) 从 {from_text} 转入 #{ts['to']['owner']}"
 
-            print(content)
-            tg.send_message(settings.chat_id, content)
\ No newline at end of file
+                    print(content)
+                    tg.send_message(settings.chat_id, content)
+    except Exception as e:
+        logging.error(traceback.format_exc())
+        tg.send_message(settings.chat_id, traceback.format_exc())
\ No newline at end of file
diff --git a/strategy_test.py b/strategy_test.py
index d509d57..e5f2798 100644
--- a/strategy_test.py
+++ b/strategy_test.py
@@ -1,4 +1,9 @@
 import strategy.support_resistance as sr
+import strategy.large_trans as lt
 
 
-sr.strategy_run('BTCUSDT', '1h')
\ No newline at end of file
+
+lt.strategy_run()
+
+
+# sr.strategy_run('BTCUSDT', '1h')
\ No newline at end of file