Update autotrack.py

autotrack.py

@@ -1,9 +1,4 @@
-# autotrack.py
-# Auto-track milestones (e.g., 2×) for any Contract Address (CA) mentioned in NEW messages
-# from YOUR group only: https://t.me/MidasTouchsignalll
-#
-# Data: Dexscreener (free) + fallback Jupiter (Solana)
-# Deps: telethon, aiohttp
+
 
 import os
 import re
@@ -15,46 +10,27 @@ from dataclasses import dataclass, field
 from typing import Optional, Dict, List, Tuple
 from datetime import datetime, timezone, timedelta
 
-from telethon import TelegramClient, events
-from telethon.sessions import StringSession, MemorySession
-from telethon.errors.rpcerrorlist import FloodWaitError
+from telethon import events, TelegramClient
 
 # =========================
 # ENV / CONFIG
 # =========================
-API_ID = int(os.environ.get("API_ID", "0"))
-API_HASH = os.environ.get("API_HASH", "")
-STRING_SESSION = os.environ.get("STRING_SESSION", "")
-
-# Announce ke grup kamu (dipakai juga sebagai sumber pesan)
 TARGET_CHAT = os.environ.get("TARGET_CHAT", "https://t.me/MidasTouchsignalll")
-
-# Polling interval harga
 TRACK_POLL_SECS = int(os.environ.get("TRACK_POLL_SECS", "20"))
 
-# Milestones "x" sebagai string koma, contoh: "1.5,2,3"
-_ms_env = os.environ.get("MILESTONES", "2")
-try:
-    DEFAULT_MILESTONES = sorted({float(x.strip()) for x in _ms_env.split(",") if x.strip()})
-except Exception:
-    DEFAULT_MILESTONES = [2.0]
-
-STOP_WHEN_HIT = True  # stop setelah milestone terbesar tercapai
+MIN_START_MULT = float(os.environ.get("MIN_START_MULT", "1.5"))     # start dari x1.5
+STEP_MULT = float(os.environ.get("STEP_MULT", "0.5"))               # naik 0.5 tiap hit
+USE_MULTIPLICATIVE_STEP = os.environ.get("USE_MULTIPLICATIVE_STEP", "0") == "1"
 
-# Abaikan pesan lebih tua dari (startup - buffer)
 BACKFILL_BUFFER_MINUTES = int(os.environ.get("BACKFILL_BUFFER_MINUTES", "3"))
+BOT_MARKER = os.environ.get("BOT_MARKER", "【MT-AUTOTRACK】")
 
-# Marker antirecursive: ditambahkan ke semua pengumuman bot
-BOT_MARKER = "【MT-AUTOTRACK】"
-
-# =========================
 # HTTP endpoints
-# =========================
 DEXSCREENER_TOKEN_URL = "https://api.dexscreener.com/latest/dex/tokens/"
 JUPITER_URL = "https://price.jup.ag/v6/price?ids="  # free (Solana only)
 
 # =========================
-# Helpers
+# Helpers (formatting)
 # =========================
 def _fmt_money(x: Optional[float]) -> str:
     if x is None:
@@ -79,15 +55,12 @@ def _fmt_big(x: Optional[float]) -> str:
 # =========================
 CA_SOL_RE = re.compile(r"\b[1-9A-HJ-NP-Za-km-z]{32,48}\b")   # Solana base58 (approx)
 CA_EVM_RE = re.compile(r"\b0x[a-fA-F0-9]{40}\b")             # EVM 0x...
-
 CA_LABEL_RE = re.compile(r"\bCA\s*[:=]\s*(\S+)", re.IGNORECASE)
 
 def extract_ca(text: str) -> Optional[str]:
     """Return first found CA (EVM or Solana). Prefer 'CA: <addr>' label if present."""
     if not text:
         return None
-
-    # Prefer explicit "CA: ..."
     m = CA_LABEL_RE.search(text)
     if m:
         cand = m.group(1)
@@ -95,8 +68,6 @@ def extract_ca(text: str) -> Optional[str]:
             return cand.lower()
         if CA_SOL_RE.fullmatch(cand):
             return cand
-
-    # Else, scan for EVM then Sol
     m2 = CA_EVM_RE.search(text)
     if m2:
         return m2.group(0).lower()
@@ -106,7 +77,7 @@ def extract_ca(text: str) -> Optional[str]:
     return None
 
 # =========================
-# Tracker core
+# Tracker core (generator milestones)
 # =========================
 @dataclass
 class TrackItem:
@@ -116,17 +87,16 @@ class TrackItem:
     entry_mcap: Optional[float] = None
     symbol_hint: Optional[str] = None
     source_link: Optional[str] = None
-    milestones: List[float] = field(default_factory=lambda: [2.0])
-    hit: Dict[float, bool] = field(default_factory=dict)
-    poll_secs: int = 20
-    stop_when_hit: bool = True
+    poll_secs: int = TRACK_POLL_SECS
+    # generator state
+    next_target: float = field(default_factory=lambda: max(1.5, MIN_START_MULT))
     started_at: float = field(default_factory=time.time)
 
 class PriceTracker:
     """
-    Usage:
-        tracker = PriceTracker(client, announce_chat=TARGET_CHAT)
-        await tracker.start(ca=..., basis="mcap", milestones=[2], poll_secs=20, source_link=..., symbol_hint=...)
+    Milestone tanpa batas.
+    - next_target dimulai dari MIN_START_MULT (default 1.5).
+    - Saat ratio >= next_target → announce, lalu next_target += STEP_MULT (atau *= (1+STEP) jika USE_MULTIPLICATIVE_STEP=1).
     """
     def __init__(self, client: TelegramClient, announce_chat):
         self.client = client
@@ -134,7 +104,7 @@ class PriceTracker:
         self._tasks: Dict[str, asyncio.Task] = {}
         self._items: Dict[str, TrackItem] = {}
 
-    # ------------- HTTP helpers -------------
+    # ---------- HTTP ----------
     async def _get(self, url: str, headers: Optional[Dict[str, str]] = None, timeout: int = 8):
         tout = aiohttp.ClientTimeout(total=timeout)
         async with aiohttp.ClientSession(timeout=tout, headers=headers) as sess:
@@ -146,7 +116,6 @@ class PriceTracker:
     async def _dexscreener_price(self, ca: str) -> Optional[Tuple[Optional[float], Optional[str], Optional[float]]]:
         """
         Return (priceUsd, symbol, marketCapUsd/FDV) from 'best pair' by highest USD liquidity.
-        price or mcap may be None if unavailable.
         """
         data = await self._get(DEXSCREENER_TOKEN_URL + ca)
         if not data:
@@ -195,7 +164,7 @@ class PriceTracker:
             return {"price": jp, "symbol_hint": None, "mcap": None}
         return None
 
-    # ------------- Announce helpers (brand EN) -------------
+    # ---------- Announce ----------
     def _name(self, item: TrackItem) -> str:
         s = item.symbol_hint or ""
         return f"{s} ({item.ca[:4]}…{item.ca[-4:]})" if s else item.ca
@@ -213,19 +182,19 @@ class PriceTracker:
             "New contract detected:\n\n"
             f"CA: `{item.ca}`\n\n"
             f"Tracking Basis: **{basis_label}**\n"
-            f"Entry: {entry_disp} • Milestones: {', '.join([f'{m}×' for m in item.milestones])}\n"
+            f"Entry: {entry_disp} • Next milestone: {item.next_target:.2f}×\n"
             + (f"🔗 {item.source_link}\n" if item.source_link else "")
             + "\nRemember: This is a signal, not financial advice.\n"
             "Stay safe, stay golden ✨"
         )
 
-    def _milestone_text(self, item: TrackItem, m: float, ratio: float, cur_price: Optional[float], cur_mcap: Optional[float]) -> str:
+    def _milestone_text(self, item: TrackItem, hit_level: float, ratio: float, cur_price: Optional[float], cur_mcap: Optional[float]) -> str:
         if item.basis == "mcap":
             change = f"{_fmt_big(item.entry_mcap)} → {_fmt_big(cur_mcap)}  (~{ratio:.2f}×)"
-            milestone_line = f"Milestone reached: **{m}× Market Cap**"
+            milestone_line = f"Milestone reached: **{hit_level:.2f}× Market Cap**"
         else:
             change = f"{_fmt_money(item.entry_price)} → {_fmt_money(cur_price)}  (~{ratio:.2f}×)"
-            milestone_line = f"Milestone reached: **{m}× Price**"
+            milestone_line = f"Milestone reached: **{hit_level:.2f}× Price**"
 
         elapsed = int(time.time() - item.started_at)
         mm, ss = divmod(elapsed, 60)
@@ -241,7 +210,7 @@ class PriceTracker:
             "Stay safe, stay golden ✨"
         )
 
-    # ------------- Loop -------------
+    # ---------- Loop ----------
     async def _loop(self, item: TrackItem):
         # init snapshot
         snap = await self._get_snapshot(item.ca)
@@ -256,9 +225,13 @@ class PriceTracker:
         if not item.symbol_hint and snap.get("symbol_hint"):
             item.symbol_hint = snap.get("symbol_hint")
 
+        # Jika basis mcap tapi tidak ada mcap → fallback ke price
         if item.basis == "mcap" and not item.entry_mcap:
             item.basis = "price"
 
+        # Pastikan next_target minimal MIN_START_MULT dan > 1.0
+        item.next_target = max(MIN_START_MULT, 1.0001)
+
         basis_label = "Market Cap" if item.basis == "mcap" else "Price"
         await self._say(self._start_text(item, basis_label))
 
@@ -285,180 +258,88 @@ class PriceTracker:
                     continue
                 ratio = (cur_price / item.entry_price) if item.entry_price > 0 else 0.0
 
-            # milestones
-            for m in item.milestones:
-                if item.hit.get(m):
-                    continue
-                if ratio >= m:
-                    item.hit[m] = True
-                    await self._say(self._milestone_text(item, m, ratio, cur_price, cur_mcap))
-                    if item.stop_when_hit and m == max(item.milestones):
-                        await self._say(f"🛑 Tracking stopped for {self._name(item)} (final milestone reached).")
-                        return
+            # --- GENERATOR TANPA BATAS ---
+            # Kirim semua milestone yang terlewati (kalau harga "loncat")
+            # contoh: next_target 2.0 tapi ratio 2.7 → kirim 2.0 dan 2.5
+            hits_this_poll = 0
+            while ratio >= item.next_target:
+                # Anti spam: batasi hit per poll (optional)
+                if hits_this_poll >= 4:
+                    break
+                hit_level = item.next_target
+                await self._say(self._milestone_text(item, hit_level, ratio, cur_price, cur_mcap))
+                # next target
+                if USE_MULTIPLICATIVE_STEP:
+                    # multiplicative: misal STEP_MULT=0.5 => next *= 1.5
+                    item.next_target = round(item.next_target * (1.0 + STEP_MULT), 6)
+                else:
+                    # additive: next += 0.5
+                    item.next_target = round(item.next_target + STEP_MULT, 6)
+                hits_this_poll += 1
 
             await asyncio.sleep(item.poll_secs)
 
-    # ------------- Public -------------
+    # ---------- Public ----------
     def is_tracking(self, ca: str) -> bool:
-        t = self._tasks.get(ca)
-        return bool(t) and not t.done()
-
-    async def start(
-        self,
-        ca: str,
-        *,
-        basis: str = "mcap",
-        entry_price: Optional[float] = None,
-        entry_mcap: Optional[float] = None,
-        milestones: List[float] = None,
-        poll_secs: int = 20,
-        source_link: Optional[str] = None,
-        symbol_hint: Optional[str] = None,
-        stop_when_hit: bool = True,
-    ):
-        ca = ca.strip()
+        return ca in self._tasks and not self._tasks[ca].done()
+
+    async def start(self, ca: str, basis: str = "mcap", source_link: Optional[str] = None, symbol_hint: Optional[str] = None, poll_secs: Optional[int] = None):
         if self.is_tracking(ca):
             return
-        if milestones is None or not milestones:
-            milestones = DEFAULT_MILESTONES
-
-        item = TrackItem(
-            ca=ca,
-            basis=basis.lower(),
-            entry_price=entry_price,
-            entry_mcap=entry_mcap,
-            milestones=sorted(set(milestones)),
-            poll_secs=poll_secs,
-            source_link=source_link,
-            symbol_hint=symbol_hint,
-            stop_when_hit=stop_when_hit,
-        )
-        self._tasks[ca] = asyncio.create_task(self._loop(item))
-
-
+        item = TrackItem(ca=ca, basis=basis, source_link=source_link, symbol_hint=symbol_hint)
+        if poll_secs:
+            item.poll_secs = poll_secs
+        task = asyncio.create_task(self._loop(item))
+        self._tasks[ca] = task
 
 # =========================
-# Setup: attach to existing client from botsignal
+# Wiring ke Telethon: setup_autotrack(client)
 # =========================
-def setup_autotrack(shared_client: TelegramClient, announce_chat: str | None = None):
+def setup_autotrack(client: TelegramClient):
     """
-    Attach autotrack to an existing Telethon client.
-    - Registers the new-message handler for TARGET_CHAT
-    - Initializes global tracker with the shared client
+    Pasang handler yang:
+    - Mendengar pesan BARU dari TARGET_CHAT kamu.
+    - Ekstrak CA dari teks.
+    - Mulai tracking otomatis bila belum berjalan.
+    - Skip pesan yang berasal dari bot sendiri (ada BOT_MARKER).
     """
-    global client, tracker, startup_time_utc
-    client = shared_client
-    if announce_chat:
-        ac = announce_chat
-    else:
-        ac = TARGET_CHAT
-    # initialize tracker with shared client
-    tracker = PriceTracker(client, announce_chat=ac)
-    # startup timestamp for anti-backfill
-    startup_time_utc = datetime.now(timezone.utc)
-    # register handler
-    client.add_event_handler(on_new_message, events.NewMessage(chats=(TARGET_CHAT,)))
-    print("[AUTOTRACK] attached to shared client; listening on", TARGET_CHAT)
-
-# =========================
-# Client bootstrap
-# =========================
-def build_client() -> TelegramClient:
-    if STRING_SESSION:
-        print(">> Using StringSession (persistent).")
-        return TelegramClient(StringSession(STRING_SESSION), API_ID, API_HASH)
-    print(">> Using MemorySession (login each run).")
-    return TelegramClient(MemorySession(), API_ID, API_HASH)
-
-client: TelegramClient | None = None
-startup_time_utc = None
-me_user_id: Optional[int] = None  # filled at start
-
-tracker: PriceTracker | None = None
+    tracker = PriceTracker(client, announce_chat=TARGET_CHAT)
+    started_at = datetime.now(timezone.utc)
 
-# =========================
-# Event handler: ONLY your group
-# =========================
-CUTOFF_BUFFER = timedelta(minutes=BACKFILL_BUFFER_MINUTES)
-
-def _is_old_message(msg_dt: Optional[datetime]) -> bool:
-    if not isinstance(msg_dt, datetime):
-        return False
-    # Telethon new-message handler biasanya sudah hanya message baru.
-    # Buffer ini sebagai pengaman tambahan.
-    return msg_dt.replace(tzinfo=timezone.utc) < (startup_time_utc - CUTOFF_BUFFER)
-
-def _is_bot_own_message(event) -> bool:
-    # Jangan proses pesan yang dikirim oleh diri sendiri (script ini)
-    if getattr(event, "out", False):
-        return True
-    txt = (event.raw_text or "") if hasattr(event, "raw_text") else ""
-    return BOT_MARKER in (txt or "")
-
-async def on_new_message(event):
-    try:
-        # anti-loop: jangan proses pesan sendiri/marker
-        if _is_bot_own_message(event):
+    @client.on(events.NewMessage(chats=TARGET_CHAT))
+    async def _on_new_message(ev: events.NewMessage.Event):
+        msg = ev.message
+        # Hindari recursive: jika pesan berisi marker bot, abaikan
+        if msg.raw_text and BOT_MARKER in msg.raw_text:
             return
 
-        msg = event.message
-        if _is_old_message(getattr(msg, "date", None)):
-            # ignore any old message near startup (extra safety)
-            return
+        # Hindari backfill pesan lama di awal start
+        if msg.date:
+            if msg.date.tzinfo is None:
+                msg_dt = msg.date.replace(tzinfo=timezone.utc)
+            else:
+                msg_dt = msg.date.astimezone(timezone.utc)
+            if msg_dt < (started_at - timedelta(minutes=BACKFILL_BUFFER_MINUTES)):
+                return
 
-        text = msg.message or (getattr(msg, "raw_text", None) or "")
+        text = (msg.raw_text or "").strip()
         ca = extract_ca(text)
         if not ca:
-            return  # no CA found
+            return
 
-        # Optional: link back to source message
-        source_link = None
+        # Link sumber (opsional)
+        src_link = None
         try:
-            # If chat has a public username, build t.me link
-            chat = await event.get_chat()
-            uname = getattr(chat, "username", None)
-            mid = getattr(msg, "id", None)
-            if uname and mid:
-                source_link = f"https://t.me/{uname}/{mid}"
+            src_link = await client.get_messages(TARGET_CHAT, ids=msg.id)
+            if getattr(src_link, "id", None) is not None:
+                # gunakan t.me link standar (public group disarankan)
+                src_link = f"https://t.me/{ev.chat.username}/{msg.id}" if getattr(ev.chat, "username", None) else None
         except:
-            pass
-
-        # Start tracking
-        await tracker.start(
-            ca=ca,
-            basis="mcap",
-            milestones=DEFAULT_MILESTONES,
-            poll_secs=TRACK_POLL_SECS,
-            source_link=source_link,
-            stop_when_hit=STOP_WHEN_HIT,
-        )
-        # (Optional) send small ack? Usually start_text already covers announce.
-        # Here we rely on _start_text inside tracker._loop
-    except Exception as e:
-        print(f"[AUTOTRACK] error: {e}")
+            src_link = None
 
-# =========================
-# Entrypoint
-# =========================
+        # Start tracking bila belum
+        if not tracker.is_tracking(ca):
+            # default basis mcap; fallback ke price terjadi di _loop jika mcap tidak tersedia
+            await tracker.start(ca=ca, basis="mcap", source_link=src_link)
 
-async def main():
-    global client, tracker, startup_time_utc
-    if client is None:
-        client = build_client()
-    startup_time_utc = datetime.now(timezone.utc)
-    tracker = PriceTracker(client, announce_chat=TARGET_CHAT)
-    await client.start()
-    try:
-        me = await client.get_me()
-        globals()["me_user_id"] = int(getattr(me, "id", 0))
-        print(f">> Logged in as: {getattr(me, 'username', None) or me_user_id}")
-    except Exception as e:
-        print(f"Warning: cannot resolve self id: {e}")
-
-    print("AutoTrack running. Listening ONLY your group for NEW messages...")
-    # ensure handler is attached in standalone mode
-    client.add_event_handler(on_new_message, events.NewMessage(chats=(TARGET_CHAT,)))
-    await client.run_until_disconnected()
-
-if __name__ == "__main__":
-    asyncio.run(main())
+    return tracker  # optional: bisa dipakai kalau mau manual query status