farmer connects to solver

Author: almogdepaz

chia/farmer/start_farmer.py

@@ -62,7 +62,8 @@ def create_farmer_service(
         node_type=NodeType.FARMER,
         advertised_port=service_config["port"],
         service_name=SERVICE_NAME,
-        connect_peers=get_unresolved_peer_infos(service_config, NodeType.FULL_NODE),
+        connect_peers=get_unresolved_peer_infos(service_config, NodeType.FULL_NODE)
+        | get_unresolved_peer_infos(service_config, NodeType.SOLVER),
         on_connect_callback=node.on_connect,
         network_id=network_id,
         rpc_info=rpc_info,

chia/server/server.py

@@ -172,7 +172,7 @@ def create(
         private_cert_path, private_key_path = None, None
         public_cert_path, public_key_path = None, None
 
-        authenticated_client_types = {NodeType.HARVESTER, NodeType.SOLVER}
+        authenticated_client_types = {NodeType.HARVESTER, NodeType.FARMER, NodeType.SOLVER}
         authenticated_server_types = {
             NodeType.HARVESTER,
             NodeType.FARMER,

chia/simulator/setup_services.py

@@ -514,7 +514,6 @@ async def setup_solver(
     b_tools: BlockTools,
     consensus_constants: ConsensusConstants,
     start_service: bool = True,
-    farmer_peer: Optional[UnresolvedPeerInfo] = None,
 ) -> AsyncGenerator[SolverService, None]:
     with create_lock_and_load_config(b_tools.root_path / "config" / "ssl" / "ca", root_path) as config:
         config["logging"]["log_stdout"] = True
@@ -528,7 +527,6 @@ async def setup_solver(
         root_path,
         config,
         consensus_constants,
-        farmer_peers={farmer_peer} if farmer_peer is not None else set(),
     )
 
     async with service.manage(start=start_service):

chia/solver/start_solver.py

@@ -19,7 +19,6 @@
 from chia.solver.solver_api import SolverAPI
 from chia.solver.solver_rpc_api import SolverRpcApi
 from chia.solver.solver_service import SolverService
-from chia.types.peer_info import UnresolvedPeerInfo
 from chia.util.chia_logging import initialize_service_logging
 from chia.util.config import load_config, load_config_cli
 from chia.util.default_root import resolve_root_path
@@ -35,7 +34,6 @@ def create_solver_service(
     root_path: pathlib.Path,
     config: dict[str, Any],
     consensus_constants: ConsensusConstants,
-    farmer_peers: set[UnresolvedPeerInfo] = set(),
     connect_to_daemon: bool = True,
     override_capabilities: Optional[list[tuple[uint16, str]]] = None,
 ) -> SolverService:
@@ -64,7 +62,6 @@ def create_solver_service(
         service_name=SERVICE_NAME,
         upnp_ports=upnp_list,
         on_connect_callback=node.on_connect,
-        connect_peers=farmer_peers,
         network_id=network_id,
         rpc_info=rpc_info,
         connect_to_daemon=connect_to_daemon,