From 3dc145fe68ea2459a2c074bb6499e33d6f16bc84 Mon Sep 17 00:00:00 2001
From: Victor Shyba <victor.shyba@gmail.com>
Date: Sun, 3 Apr 2022 23:20:02 -0300
Subject: [PATCH] make peer list query trackers

---
 lbry/extras/daemon/components.py |  2 +-
 lbry/extras/daemon/daemon.py     | 19 ++++++++++++-------
 lbry/torrent/tracker.py          |  7 +++++++
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/lbry/extras/daemon/components.py b/lbry/extras/daemon/components.py
index b3be409e0..88abe11a4 100644
--- a/lbry/extras/daemon/components.py
+++ b/lbry/extras/daemon/components.py
@@ -725,7 +725,7 @@ class TrackerAnnouncerComponent(Component):
 
     @property
     def component(self):
-        return self
+        return self.tracker_client
 
     @property
     def running(self):
diff --git a/lbry/extras/daemon/daemon.py b/lbry/extras/daemon/daemon.py
index 6881889bc..9c9ea8840 100644
--- a/lbry/extras/daemon/daemon.py
+++ b/lbry/extras/daemon/daemon.py
@@ -44,7 +44,7 @@ from lbry.error import (
 from lbry.extras import system_info
 from lbry.extras.daemon import analytics
 from lbry.extras.daemon.components import WALLET_COMPONENT, DATABASE_COMPONENT, DHT_COMPONENT, BLOB_COMPONENT
-from lbry.extras.daemon.components import FILE_MANAGER_COMPONENT, DISK_SPACE_COMPONENT
+from lbry.extras.daemon.components import FILE_MANAGER_COMPONENT, DISK_SPACE_COMPONENT, TRACKER_ANNOUNCER_COMPONENT
 from lbry.extras.daemon.components import EXCHANGE_RATE_MANAGER_COMPONENT, UPNP_COMPONENT
 from lbry.extras.daemon.componentmanager import RequiredCondition
 from lbry.extras.daemon.componentmanager import ComponentManager
@@ -4971,21 +4971,26 @@ class Daemon(metaclass=JSONRPCServerType):
         if not is_valid_blobhash(blob_hash):
             # TODO: use error from lbry.error
             raise Exception("invalid blob hash")
-        peers = []
         peer_q = asyncio.Queue(loop=self.component_manager.loop)
+        if self.component_manager.has_component(TRACKER_ANNOUNCER_COMPONENT):
+            tracker = self.component_manager.get_component(TRACKER_ANNOUNCER_COMPONENT)
+            tracker_peers = await tracker.get_kademlia_peer_list(bytes.fromhex(blob_hash))
+            log.info("Found %d peers for %s from trackers.", len(tracker_peers), blob_hash[:8])
+            peer_q.put_nowait(tracker_peers)
+        peers = []
         await self.dht_node._peers_for_value_producer(blob_hash, peer_q)
         while not peer_q.empty():
             peers.extend(peer_q.get_nowait())
-        results = [
-            {
-                "node_id": hexlify(peer.node_id).decode(),
+        results = {
+            (peer.address, peer.tcp_port): {
+                "node_id": hexlify(peer.node_id).decode() if peer.node_id else None,
                 "address": peer.address,
                 "udp_port": peer.udp_port,
                 "tcp_port": peer.tcp_port,
             }
             for peer in peers
-        ]
-        return paginate_list(results, page, page_size)
+        }
+        return paginate_list(list(results.values()), page, page_size)
 
     @requires(DATABASE_COMPONENT)
     async def jsonrpc_blob_announce(self, blob_hash=None, stream_hash=None, sd_hash=None):
diff --git a/lbry/torrent/tracker.py b/lbry/torrent/tracker.py
index d534e2a14..228353ef1 100644
--- a/lbry/torrent/tracker.py
+++ b/lbry/torrent/tracker.py
@@ -5,10 +5,12 @@ import struct
 import asyncio
 import logging
 import time
+import ipaddress
 from collections import namedtuple
 from functools import reduce
 from typing import Optional
 
+from lbry.dht.node import get_kademlia_peers_from_hosts
 from lbry.utils import resolve_host, async_timed_cache, cache_concurrent
 from lbry.wallet.stream import StreamController
 from lbry import version
@@ -195,6 +197,11 @@ class TrackerClient:
                 found.append(result)
         return found
 
+    async def get_kademlia_peer_list(self, info_hash):
+        responses = await self.get_peer_list(info_hash)
+        peers = [(str(ipaddress.ip_address(peer.address)), peer.port) for ann in responses for peer in ann.peers]
+        return await get_kademlia_peers_from_hosts(peers)
+
     async def _probe_server(self, info_hash, tracker_host, tracker_port, stopped=False):
         result = None
         try: