Update whale_news_data.py

whale_news_data.py

@@ -52,7 +52,11 @@ class EnhancedWhaleMonitor:
         self._initialize_contracts_db(contracts_db or {})
 
         self.data_manager = None
-        self.coingecko_semaphore = asyncio.Semaphore(1)
+        # ✅ الإصلاح: إضافة منظم طلبات لـ CoinGecko
+        self.coingecko_semaphore = asyncio.Semaphore(1) # 1 طلب متزامن فقط لـ CoinGecko
+        # ✅ الإصلاح: إضافة منظم طلبات لـ RPC
+        self.rpc_semaphore = asyncio.Semaphore(5) # 5 طلبات RPC متزامنة كحد أقصى (لجميع الشبكات)
+
         self.r2_service = r2_service
 
         self.address_labels = {}
@@ -202,9 +206,8 @@ class EnhancedWhaleMonitor:
                     print(f"⚠️ مفتاح {env_var} غير متوفر أو فارغ.")
                     setattr(self, attr_name, None)
             else:
-                 # إذا لم تكن الخاصية موجودة أصلاً (مثل bscscan_key إذا لم يتم تعيينها كمتغير بيئة)
+                 # إذا لم تكن الخاصية موجودة أصلاً
                  print(f"ℹ️ خاصية المفتاح {attr_name} (لـ {env_var}) غير معرفة في الكلاس.")
-                 # يمكنك تعيينها إلى None هنا إذا أردت التأكد
                  setattr(self, attr_name, None)
 
     def _get_ethereum_rpc_endpoints(self):
@@ -295,14 +298,15 @@ class EnhancedWhaleMonitor:
         ]
 
     def _get_solana_rpc_endpoints(self):
-        """الحصول على نقاط RPC مجانية لشبكة Solana (بدون مفاتيح API)"""
+        """الحصول على نقاط RPC مجانية لشبكة Solana (بدون مفاتيح API) - محدثة"""
         endpoints = [
-            'https://api.mainnet-beta.solana.com',
-            'https://ssc-dao.genesysgo.net/',
-            'https://solana-mainnet.rpc.extrnode.com',
-            'https://solana-mainnet.phantom.tech/',
-            'https://mainnet.rpc.solana.pyth.network',
-            'https://rpc.ankr.com/solana',
+            'https://api.mainnet-beta.solana.com',      # الرسمي (قد يكون محدود الطلبات بشدة)
+            'https://solana-mainnet.publicnode.com',    # PublicNode (جديد وموثوق)
+            'https://ssc-dao.genesysgo.net/',           # GenesysGo (قديم نسبياً)
+            'https://solana-mainnet.rpc.extrnode.com',  # Extrnode (مزود عام)
+            'https://solana-mainnet.phantom.tech/',     # Phantom Wallet RPC (قد يكون للاستخدام المحدود)
+            'https://rpc.ankr.com/solana',            # Ankr (يسبب 403 غالباً بدون مفتاح)
+            # 'https://mainnet.rpc.solana.pyth.network',  # تمت إزالته (خطأ DNS)
         ]
         print(f"ℹ️ قائمة Solana RPC Endpoints (مجانية وبدون مفاتيح) المستخدمة: {endpoints}")
         return endpoints
@@ -387,7 +391,6 @@ class EnhancedWhaleMonitor:
                  print(f"   ℹ️ تم تحديث صيغة {updated_count} عقد إلى الصيغة الجديدة.")
                  await self._save_contracts_to_r2()
 
-
         except ClientError as e:
             if e.response['Error']['Code'] == 'NoSuchKey':
                 print("⚠️ لم يتم العثور على قاعدة بيانات العقود في R2. ستبدأ فارغة.")
@@ -413,7 +416,6 @@ class EnhancedWhaleMonitor:
             contract_info = None
             network = None
 
-            # 1. البحث عن عقد العملة والشبكة
             if contract_address and isinstance(contract_address, str):
                 network = self._detect_network_from_address(contract_address)
                 contract_info_from_db = await self._find_contract_address_enhanced(symbol)
@@ -436,14 +438,12 @@ class EnhancedWhaleMonitor:
 
             print(f"🌐 البحث في الشبكة المحددة: {network_final} للعقد: {contract_address_final}")
 
-            # 3. جلب بيانات التحويلات
             transfers = await self._get_targeted_transfer_data(contract_address_final, network_final)
 
             if not transfers:
                 print(f"⚠️ لم يتم العثور على تحويلات للعملة {symbol} على شبكة {network_final}")
                 return self._create_no_transfers_response(symbol)
 
-            # 4. ترشيح التحويلات الحديثة
             recent_transfers = self._filter_recent_transfers(transfers, max_minutes=120)
 
             if not recent_transfers:
@@ -452,7 +452,6 @@ class EnhancedWhaleMonitor:
 
             print(f"📊 تم جلب {len(recent_transfers)} تحويلة حديثة فريدة للعملة {symbol}")
 
-            # 5. تحليل تأثير الحيتان
             analysis = await self._analyze_enhanced_whale_impact(recent_transfers, symbol, contract_address_final, network_final)
 
             return analysis
@@ -573,9 +572,10 @@ class EnhancedWhaleMonitor:
                     endpoint_name = endpoint.split('//')[1].split('/')[0] if '//' in endpoint else endpoint
                     print(f"   🔍 محاولة جلب سجلات التحويلات لـ {network} عبر {endpoint_name}...")
 
-                    # ✅ الإصلاح: استخدام "self.http_client" مباشرة
-                    payload_block = {"jsonrpc": "2.0", "method": "eth_blockNumber", "params": [], "id": int(time.time())}
-                    response_block = await self.http_client.post(endpoint, json=payload_block, timeout=15.0)
+                    # ✅ الإصلاح: استخدام "self.rpc_semaphore"
+                    async with self.rpc_semaphore:
+                        payload_block = {"jsonrpc": "2.0", "method": "eth_blockNumber", "params": [], "id": int(time.time())}
+                        response_block = await self.http_client.post(endpoint, json=payload_block, timeout=15.0)
                     response_block.raise_for_status()
                     json_response_block = response_block.json()
                     result_block = json_response_block.get('result')
@@ -586,8 +586,9 @@ class EnhancedWhaleMonitor:
                         continue
                     latest_block = int(result_block, 16)
 
-                    payload_latest_block_time = {"jsonrpc": "2.0", "method": "eth_getBlockByNumber", "params": [hex(latest_block), False], "id": int(time.time())+1}
-                    response_latest_time = await self.http_client.post(endpoint, json=payload_latest_block_time, timeout=15.0)
+                    async with self.rpc_semaphore:
+                        payload_latest_block_time = {"jsonrpc": "2.0", "method": "eth_getBlockByNumber", "params": [hex(latest_block), False], "id": int(time.time())+1}
+                        response_latest_time = await self.http_client.post(endpoint, json=payload_latest_block_time, timeout=15.0)
                     latest_block_timestamp_approx = int(time.time())
                     if response_latest_time.status_code == 200:
                          latest_block_data = response_latest_time.json().get('result')
@@ -602,7 +603,8 @@ class EnhancedWhaleMonitor:
                         "params": [{"fromBlock": hex(from_block), "toBlock": hex(latest_block), "address": contract_address_checksum, "topics": [TRANSFER_EVENT_SIGNATURE]}],
                         "id": int(time.time())+2
                     }
-                    response_logs = await self.http_client.post(endpoint, json=payload_logs, timeout=45.0)
+                    async with self.rpc_semaphore:
+                        response_logs = await self.http_client.post(endpoint, json=payload_logs, timeout=45.0)
                     response_logs.raise_for_status()
                     json_response_logs = response_logs.json()
                     logs = json_response_logs.get('result')
@@ -706,8 +708,9 @@ class EnhancedWhaleMonitor:
                         "params": [ token_address, {"limit": limit, "commitment": "confirmed"} ]
                     }
 
-                    # ✅ الإصلاح: استخدام "self.http_client" مباشرة
-                    response_signatures = await self.http_client.post(endpoint, json=payload_signatures, timeout=20.0)
+                    # ✅ الإصلاح: استخدام "self.rpc_semaphore"
+                    async with self.rpc_semaphore:
+                        response_signatures = await self.http_client.post(endpoint, json=payload_signatures, timeout=20.0)
 
                     if response_signatures.status_code == 403:
                         print(f"     ⚠️ Solana endpoint {endpoint_name} failed: 403 Forbidden")
@@ -741,10 +744,11 @@ class EnhancedWhaleMonitor:
 
                     processed_count = 0
                     transaction_tasks = []
-                    # ✅ الإصلاح: تمرير "self.http_client" مباشرة
+                    
+                    # ✅ الإصلاح: تمرير "self" إلى الدالة المساعدة
                     for signature in signatures[:20]:
                         transaction_tasks.append(
-                            self._get_solana_transaction_detail_with_retry(signature, endpoint, self.http_client)
+                            self._get_solana_transaction_detail_with_retry(self, signature, endpoint, self.http_client)
                         )
                     transaction_details = await asyncio.gather(*transaction_tasks)
 
@@ -794,12 +798,16 @@ class EnhancedWhaleMonitor:
             return []
 
 
+    # ✅ الإصلاح: إضافة "self" كباراميتر
     async def _get_solana_transaction_detail_with_retry(self, signature, endpoint, client: httpx.AsyncClient, retries=2, delay=0.5):
         """جلب تفاصيل معاملة Solana مع محاولات إعادة بسيطة باستخدام client مشترك"""
         last_exception = None
         for attempt in range(retries):
             try:
-                detail = await self._get_solana_transaction_detail(signature, endpoint, client)
+                # ✅ الإصلاح: استخدام "self.rpc_semaphore"
+                async with self.rpc_semaphore:
+                    detail = await self._get_solana_transaction_detail(signature, endpoint, client)
+                
                 if detail:
                     return detail
                 elif detail is None:
@@ -835,6 +843,7 @@ class EnhancedWhaleMonitor:
                 "method": "getTransaction",
                 "params": [ signature, {"encoding": "jsonParsed", "maxSupportedTransactionVersion": 0, "commitment": "confirmed"} ]
             }
+            # ✅ الإصلاح: لا يوجد semaphore هنا، يتم تطبيقه في الدالة التي تستدعيها
             response = await client.post(endpoint, json=payload, timeout=20.0)
             response.raise_for_status()
 
@@ -974,7 +983,6 @@ class EnhancedWhaleMonitor:
                          if sender and receiver and amount_raw > 0: break
                     if sender and receiver and amount_raw > 0: break
 
-
             if sender and receiver and amount_raw > 0:
                 return {
                     'hash': signature, 'from': sender, 'to': receiver,
@@ -1017,41 +1025,47 @@ class EnhancedWhaleMonitor:
                 "endblock": 999999999, "sort": "desc", "apikey": config['key']
             }
 
-            async with httpx.AsyncClient(timeout=20.0, verify=self.ssl_context) as client:
-                response = await client.get(config['url'], params=params)
-
-                if response.status_code == 200:
-                    data = response.json()
-                    status = str(data.get('status', '0'))
-                    message = data.get('message', '').upper()
-
-                    if status == '1' and message == 'OK':
-                        transfers = data.get('result', [])
-                        processed_transfers = []
-                        for tf in transfers:
-                            if tf.get('tokenSymbol') and tf.get('contractAddress','').lower() == contract_address.lower():
-                                 tf['network'] = network
-                                 if 'from' in tf: tf['from'] = tf['from'].lower()
-                                 if 'to' in tf: tf['to'] = tf['to'].lower()
-                                 if 'logIndex' not in tf: tf['logIndex'] = 'N/A'
-                                 processed_transfers.append(tf)
-
-                        print(f"     ✅ Explorer {network}: تم جلب {len(processed_transfers)} تحويلة توكن للعقد المحدد.")
-                        return processed_transfers
-                    elif status == '0' and "NO TRANSACTIONS FOUND" in message:
-                         print(f"     ✅ Explorer {network}: لا توجد تحويلات.")
-                         return []
-                    else:
-                        error_message = data.get('result', message)
-                        print(f"⚠️ Explorer {network} returned error: Status={status}, Message={message}, Result={error_message}")
-                        if "INVALID API KEY" in str(error_message).upper():
-                             print(f"🚨 خطأ فادح: مفتاح API الخاص بـ {network.upper()} غير صالح!")
-                        return []
+            # ✅ الإصلاح: استخدام "self.http_client" بدلاً من إنشاء client جديد
+            # ويفضل استخدام semaphore خاص بالمستكشفات إذا كان لديهم حد طلبات صارم
+            # حالياً، سنستخدم semaphore الـ RPC العام كإجراء وقائي
+            async with self.rpc_semaphore:
+                response = await self.http_client.get(config['url'], params=params, timeout=20.0)
+
+            if response.status_code == 200:
+                data = response.json()
+                status = str(data.get('status', '0'))
+                message = data.get('message', '').upper()
+
+                if status == '1' and message == 'OK':
+                    transfers = data.get('result', [])
+                    processed_transfers = []
+                    for tf in transfers:
+                        if tf.get('tokenSymbol') and tf.get('contractAddress','').lower() == contract_address.lower():
+                             tf['network'] = network
+                             if 'from' in tf: tf['from'] = tf['from'].lower()
+                             if 'to' in tf: tf['to'] = tf['to'].lower()
+                             if 'logIndex' not in tf: tf['logIndex'] = 'N/A'
+                             processed_transfers.append(tf)
+
+                    print(f"     ✅ Explorer {network}: تم جلب {len(processed_transfers)} تحويلة توكن للعقد المحدد.")
+                    return processed_transfers
+                elif status == '0' and "NO TRANSACTIONS FOUND" in message:
+                     print(f"     ✅ Explorer {network}: لا توجد تحويلات.")
+                     return []
                 else:
-                    print(f"⚠️ Explorer {network} request failed: {response.status_code}")
+                    error_message = data.get('result', message)
+                    print(f"⚠️ Explorer {network} returned error: Status={status}, Message={message}, Result={error_message}")
+                    if "INVALID API KEY" in str(error_message).upper():
+                         print(f"🚨 خطأ فادح: مفتاح API الخاص بـ {network.upper()} غير صالح!")
                     return []
+            else:
+                print(f"⚠️ Explorer {network} request failed: {response.status_code}")
+                return []
 
         except Exception as e:
+            if "Cannot reopen a client instance" in str(e):
+                 print(f"     ❌ فشل فادح (Explorer): محاولة استخدام client مغلق. {e}")
+                 return []
             print(f"❌ فشل جلب بيانات Explorer لـ {network}: {e}")
             return []
 
@@ -1257,7 +1271,10 @@ class EnhancedWhaleMonitor:
                             "params": [{"to": contract_address, "data": "0x313ce567"}, "latest"],
                             "id": int(time.time())
                         }
-                        response = await self.http_client.post(endpoint, json=payload, timeout=10.0)
+                        # ✅ الإصلاح: استخدام "self.rpc_semaphore"
+                        async with self.rpc_semaphore:
+                            response = await self.http_client.post(endpoint, json=payload, timeout=10.0)
+                        
                         if response.status_code == 200:
                             result = response.json().get('result')
                             if result and result != '0x' and result.startswith('0x'):
@@ -1284,7 +1301,6 @@ class EnhancedWhaleMonitor:
                  print(f"   ⚠️ استخدام قيمة decimals تقديرية لـ Solana: {estimated_decimals}")
                  return estimated_decimals
 
-
             print(f"❌ فشل جلب الكسور العشرية للعقد {contract_address} على شبكة {network} من جميع المصادر.")
             return None
 
@@ -1331,7 +1347,7 @@ class EnhancedWhaleMonitor:
                 'ATOM': 'cosmos', 'UNI': 'uniswap', 'AAVE': 'aave', 'KCS': 'kucoin-shares',
                 'MAVIA': 'heroes-of-mavia', 'COMMON': 'commonwealth', 'WLFI': 'wolfi',
                 'PINGPONG': 'pingpong', 'YB': 'yourbusd', 'REACT': 'react', 'XMN': 'xmine',
-                'ANOME': 'anome', 'ZEN': 'zencash', 'AKT': 'akash-network', 'UB': 'unibit', 'WLD': 'worldcoin' # إضافة WLD
+                'ANOME': 'anome', 'ZEN': 'zencash', 'AKT': 'akash-network', 'UB': 'unibit', 'WLD': 'worldcoin'
             }
 
             base_symbol = symbol.split('/')[0].upper()
@@ -1347,52 +1363,55 @@ class EnhancedWhaleMonitor:
             max_retries = 2
             for attempt in range(max_retries):
                 async with self.coingecko_semaphore:
-                    # ✅ الإصلاح: إنشاء client جديد ومؤقت هنا
-                    async with httpx.AsyncClient(timeout=10.0, headers=headers, verify=self.ssl_context) as client:
-                        try:
-                            response = await client.get(url)
-                            if response.status_code == 429:
-                                wait_time = 3 * (attempt + 1)
-                                print(f"⏰ Rate limit من CoinGecko لـ {symbol} (محاولة {attempt + 1}) - الانتظار {wait_time}s")
-                                await asyncio.sleep(wait_time)
-                                continue
-
-                            response.raise_for_status()
-                            data = response.json()
-                            price_data = data.get(coingecko_id)
-                            if price_data and 'usd' in price_data:
-                                price = price_data['usd']
-                                if isinstance(price, (int, float)) and price > 0:
-                                     return price
-                                else:
-                                     print(f"⚠️ استجابة CoinGecko تحتوي على سعر غير صالح لـ {symbol}: {price}")
-                                     return 0
+                    # ✅ الإصلاح: استخدام "self.http_client"
+                    try:
+                        response = await self.http_client.get(url, headers=headers, timeout=10.0) # استخدام headers محلي
+                        if response.status_code == 429:
+                            wait_time = 3 * (attempt + 1)
+                            print(f"⏰ Rate limit من CoinGecko لـ {symbol} (محاولة {attempt + 1}) - الانتظار {wait_time}s")
+                            await asyncio.sleep(wait_time)
+                            continue
+
+                        response.raise_for_status()
+                        data = response.json()
+                        price_data = data.get(coingecko_id)
+                        if price_data and 'usd' in price_data:
+                            price = price_data['usd']
+                            if isinstance(price, (int, float)) and price > 0:
+                                 return price
                             else:
-                                 if attempt == 0:
-                                      print(f"⚠️ لم يتم العثور على سعر لـ {coingecko_id} في CoinGecko، محاولة البحث عن المعرف...")
-                                      await asyncio.sleep(1.1)
-                                      found_id = await self._find_coingecko_id_via_search(base_symbol, client)
-                                      if found_id and found_id != coingecko_id:
-                                           print(f"   🔄 تم العثور على معرف بديل: {found_id}. إعادة المحاولة...")
-                                           coingecko_id = found_id
-                                           url = f"https://api.coingecko.com/api/v3/simple/price?ids={coingecko_id}&vs_currencies=usd"
-                                           continue
-                                      else:
-                                           print(f"   ❌ لم يتم العثور على معرف بديل لـ {base_symbol}.")
-                                           return 0
-                                 else:
-                                      print(f"⚠️ لم يتم العثور على سعر لـ {coingecko_id} في استجابة CoinGecko بعد البحث.")
-                                      return 0
-
-                        except httpx.HTTPStatusError as http_err:
-                            print(f"❌ خطأ HTTP من CoinGecko لـ {symbol}: {http_err.response.status_code}")
-                            return 0
-                        except httpx.RequestError as req_err:
-                            print(f"❌ خطأ اتصال بـ CoinGecko لـ {symbol}: {req_err}")
-                            return 0
-                        except Exception as e:
-                             print(f"❌ خطأ غير متوقع أثناء جلب السعر من CoinGecko لـ {symbol}: {e}")
-                             return 0
+                                 print(f"⚠️ استجابة CoinGecko تحتوي على سعر غير صالح لـ {symbol}: {price}")
+                                 return 0
+                        else:
+                             if attempt == 0:
+                                  print(f"⚠️ لم يتم العثور على سعر لـ {coingecko_id} في CoinGecko، محاولة البحث عن المعرف...")
+                                  await asyncio.sleep(1.1)
+                                  # ✅ الإصلاح: استخدام "self.http_client" للبحث
+                                  found_id = await self._find_coingecko_id_via_search(base_symbol, self.http_client)
+                                  if found_id and found_id != coingecko_id:
+                                       print(f"   🔄 تم العثور على معرف بديل: {found_id}. إعادة المحاولة...")
+                                       coingecko_id = found_id
+                                       url = f"https://api.coingecko.com/api/v3/simple/price?ids={coingecko_id}&vs_currencies=usd"
+                                       continue
+                                  else:
+                                       print(f"   ❌ لم يتم العثور على معرف بديل لـ {base_symbol}.")
+                                       return 0
+                             else:
+                                  print(f"⚠️ لم يتم العثور على سعر لـ {coingecko_id} في استجابة CoinGecko بعد البحث.")
+                                  return 0
+                    
+                    except Exception as inner_e:
+                        if "Cannot reopen a client instance" in str(inner_e):
+                             print(f"     ❌ فشل فادح (CoinGecko): محاولة استخدام client مغلق. {inner_e}")
+                             return 0 # لا يمكن المتابعة
+                        # التعامل مع الأخطاء الأخرى
+                        if isinstance(inner_e, httpx.HTTPStatusError):
+                            print(f"❌ خطأ HTTP من CoinGecko لـ {symbol}: {inner_e.response.status_code}")
+                        elif isinstance(inner_e, httpx.RequestError):
+                            print(f"❌ خطأ اتصال بـ CoinGecko لـ {symbol}: {inner_e}")
+                        else:
+                             print(f"❌ خطأ غير متوقع أثناء جلب السعر من CoinGecko لـ {symbol}: {inner_e}")
+                        return 0 # فشل في هذه المحاولة
 
             print(f"❌ فشل جلب السعر من CoinGecko لـ {symbol} بعد {max_retries} محاولات.")
             return 0
@@ -1405,7 +1424,9 @@ class EnhancedWhaleMonitor:
         """دالة مساعدة للبحث عن معرف CoinGecko"""
         try:
             search_url = f"https://api.coingecko.com/api/v3/search?query={symbol}"
-            response = await client.get(search_url)
+            # ✅ الإصلاح: استخدام "self.coingecko_semaphore"
+            async with self.coingecko_semaphore:
+                response = await client.get(search_url, timeout=10.0)
             response.raise_for_status()
             data = response.json()
             coins = data.get('coins', [])
@@ -1587,82 +1608,85 @@ class EnhancedWhaleMonitor:
             max_retries = 2
             for attempt in range(max_retries):
                 async with self.coingecko_semaphore:
-                    async with httpx.AsyncClient(timeout=15, headers=headers, verify=self.ssl_context) as client:
-                        try:
-                            print(f"     🔍 CoinGecko Search API Call (Attempt {attempt + 1}) for {symbol}")
-                            response = await client.get(search_url)
-
-                            if response.status_code == 429:
-                                wait_time = 3 * (attempt + 1)
-                                print(f"     ⏰ Rate limit (Search) for {symbol} - Waiting {wait_time}s")
-                                await asyncio.sleep(wait_time)
-                                continue
-
-                            response.raise_for_status()
-                            data = response.json()
-                            coins = data.get('coins', [])
-
-                            if not coins:
-                                print(f"     ❌ No matching coins found for {symbol} on CoinGecko")
-                                return None
-
-                            print(f"     📊 Found {len(coins)} potential matches for {symbol}")
-
-                            best_coin = None
-                            search_symbol_lower = symbol.lower()
-                            for coin in coins:
-                                coin_symbol = coin.get('symbol', '').lower()
-                                coin_name = coin.get('name', '').lower()
-                                if coin_symbol == search_symbol_lower:
-                                    best_coin = coin; print(f"       ✅ Exact symbol match: {coin.get('name')}"); break
-                                if not best_coin and coin_name == search_symbol_lower:
-                                    best_coin = coin; print(f"       ✅ Exact name match: {coin.get('name')}")
-                            if not best_coin:
-                                best_coin = coins[0]; print(f"       ⚠️ Using first result: {best_coin.get('name')}")
-
-                            coin_id = best_coin.get('id')
-                            if not coin_id: print(f"       ❌ No ID found"); return None
-
-                            print(f"     🔍 Fetching details for CoinGecko ID: {coin_id}")
-                            detail_url = f"https://api.coingecko.com/api/v3/coins/{coin_id}"
-                            await asyncio.sleep(1.1)
-                            detail_response = await client.get(detail_url)
-
-                            if detail_response.status_code == 429:
-                                wait_time = 5 * (attempt + 1)
-                                print(f"     ⏰ Rate limit (Details) for {coin_id} - Waiting {wait_time}s")
-                                await asyncio.sleep(wait_time)
-                                detail_response = await client.get(detail_url)
-
-                            detail_response.raise_for_status()
-                            detail_data = detail_response.json()
-                            platforms = detail_data.get('platforms', {})
-                            if not platforms: print(f"       ❌ No platform data found"); return None
-
-                            network_priority = ['ethereum', 'binance-smart-chain', 'polygon-pos', 'arbitrum-one', 'optimistic-ethereum', 'avalanche', 'fantom', 'solana']
-                            network_map = {'ethereum': 'ethereum', 'binance-smart-chain': 'bsc', 'polygon-pos': 'polygon', 'arbitrum-one': 'arbitrum', 'optimistic-ethereum': 'optimism', 'avalanche': 'avalanche', 'fantom': 'fantom', 'solana': 'solana'}
-
-                            for platform_cg in network_priority:
-                                address = platforms.get(platform_cg)
-                                if address and isinstance(address, str) and address.strip():
-                                    network = network_map.get(platform_cg)
-                                    if network:
-                                         print(f"       ✅ Found contract on {network}: {address}")
-                                         return address, network
-
-                            print(f"       ❌ No contract found on supported platforms for {coin_id}")
-                            return None
+                    # ✅ الإصلاح: استخدام "self.http_client"
+                    try:
+                        print(f"     🔍 CoinGecko Search API Call (Attempt {attempt + 1}) for {symbol}")
+                        response = await self.http_client.get(search_url, headers=headers, timeout=15.0)
 
-                        except httpx.HTTPStatusError as http_err:
-                            print(f"     ❌ HTTP Error from CoinGecko ({http_err.request.url}): {http_err.response.status_code}")
-                            return None
-                        except httpx.RequestError as req_err:
-                            print(f"     ❌ Connection Error with CoinGecko ({req_err.request.url}): {req_err}")
+                        if response.status_code == 429:
+                            wait_time = 3 * (attempt + 1)
+                            print(f"     ⏰ Rate limit (Search) for {symbol} - Waiting {wait_time}s")
+                            await asyncio.sleep(wait_time)
+                            continue
+
+                        response.raise_for_status()
+                        data = response.json()
+                        coins = data.get('coins', [])
+
+                        if not coins:
+                            print(f"     ❌ No matching coins found for {symbol} on CoinGecko")
                             return None
-                        except Exception as inner_e:
-                             print(f"     ❌ Unexpected error during CoinGecko API call (Attempt {attempt + 1}): {inner_e}")
-                             if attempt < max_retries - 1: await asyncio.sleep(1); continue
-                             else: return None
+
+                        print(f"     📊 Found {len(coins)} potential matches for {symbol}")
+
+                        best_coin = None
+                        search_symbol_lower = symbol.lower()
+                        for coin in coins:
+                            coin_symbol = coin.get('symbol', '').lower()
+                            coin_name = coin.get('name', '').lower()
+                            if coin_symbol == search_symbol_lower:
+                                best_coin = coin; print(f"       ✅ Exact symbol match: {coin.get('name')}"); break
+                            if not best_coin and coin_name == search_symbol_lower:
+                                best_coin = coin; print(f"       ✅ Exact name match: {coin.get('name')}")
+                        if not best_coin:
+                            best_coin = coins[0]; print(f"       ⚠️ Using first result: {best_coin.get('name')}")
+
+                        coin_id = best_coin.get('id')
+                        if not coin_id: print(f"       ❌ No ID found"); return None
+
+                        print(f"     🔍 Fetching details for CoinGecko ID: {coin_id}")
+                        detail_url = f"https://api.coingecko.com/api/v3/coins/{coin_id}"
+                        await asyncio.sleep(1.1)
+                        detail_response = await self.http_client.get(detail_url, headers=headers, timeout=15.0)
+
+                        if detail_response.status_code == 429:
+                            wait_time = 5 * (attempt + 1)
+                            print(f"     ⏰ Rate limit (Details) for {coin_id} - Waiting {wait_time}s")
+                            await asyncio.sleep(wait_time)
+                            detail_response = await self.http_client.get(detail_url, headers=headers, timeout=15.0)
+
+                        detail_response.raise_for_status()
+                        detail_data = detail_response.json()
+                        platforms = detail_data.get('platforms', {})
+                        if not platforms: print(f"       ❌ No platform data found"); return None
+
+                        network_priority = ['ethereum', 'binance-smart-chain', 'polygon-pos', 'arbitrum-one', 'optimistic-ethereum', 'avalanche', 'fantom', 'solana']
+                        network_map = {'ethereum': 'ethereum', 'binance-smart-chain': 'bsc', 'polygon-pos': 'polygon', 'arbitrum-one': 'arbitrum', 'optimistic-ethereum': 'optimism', 'avalanche': 'avalanche', 'fantom': 'fantom', 'solana': 'solana'}
+
+                        for platform_cg in network_priority:
+                            address = platforms.get(platform_cg)
+                            if address and isinstance(address, str) and address.strip():
+                                network = network_map.get(platform_cg)
+                                if network:
+                                     print(f"       ✅ Found contract on {network}: {address}")
+                                     return address, network
+
+                        print(f"       ❌ No contract found on supported platforms for {coin_id}")
+                        return None
+
+                    except Exception as inner_e:
+                        if "Cannot reopen a client instance" in str(inner_e):
+                             print(f"     ❌ فشل فادح (CoinGecko): محاولة استخدام client مغلق. {inner_e}")
+                             return None
+                        if isinstance(inner_e, httpx.HTTPStatusError):
+                            print(f"     �� HTTP Error from CoinGecko ({inner_e.request.url}): {inner_e.response.status_code}")
+                        elif isinstance(inner_e, httpx.RequestError):
+                            print(f"     ❌ Connection Error with CoinGecko ({inner_e.request.url}): {inner_e}")
+                        else:
+                            print(f"     ❌ Unexpected error during CoinGecko API call (Attempt {attempt + 1}): {inner_e}")
+                        
+                        if attempt < max_retries - 1: await asyncio.sleep(1); continue
+                        else: return None
 
             print(f"   ❌ Failed to get contract from CoinGecko for {symbol} after {max_retries} attempts.")
             return None
@@ -1756,7 +1780,7 @@ class EnhancedWhaleMonitor:
                 }
 
             whale_signal = whale_data.get('trading_signal', {})
-            analysis_details = whale_data # إرجاع كافة التفاصيل
+            analysis_details = whale_data
 
             return {
                 'action': whale_signal.get('action', 'HOLD'),
@@ -1787,4 +1811,4 @@ class EnhancedWhaleMonitor:
                  print(f"⚠️ خطأ أثناء إغلاق HTTP client لمراقب الحيتان: {e}")
 
 
-print("✅ EnhancedWhaleMonitor loaded - Correct RPC (eth_getLogs), Robust Solana RPC Handling (Free Endpoints), Fixed httpx client usage")
+print("✅ EnhancedWhaleMonitor loaded - RPC Rate Limiting (Semaphore) & Updated Endpoints")