Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build_scripts/pyinstaller.spec
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ SERVERS = [
"farmer",
"introducer",
"timelord",
"solver"
]

if THIS_IS_WINDOWS:
Expand Down
15 changes: 12 additions & 3 deletions chia/solver/start_solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from chia.solver.solver_api import SolverAPI
from chia.solver.solver_rpc_api import SolverRpcApi
from chia.solver.solver_service import SolverService
from chia.ssl.create_ssl import create_all_ssl
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
Expand Down Expand Up @@ -70,15 +71,24 @@ def create_solver_service(
)


async def async_main(service_config: dict[str, Any], root_path: pathlib.Path) -> int:
async def async_main(root_path: pathlib.Path) -> int:
config = load_config(root_path, "config.yaml", fill_missing_services=True)
service_config = load_config_cli(root_path, "config.yaml", SERVICE_NAME, fill_missing_services=True)
config[SERVICE_NAME] = service_config
network_id = service_config["selected_network"]
overrides = service_config["network_overrides"]["constants"][network_id]
update_testnet_overrides(network_id, overrides)
updated_constants = replace_str_to_bytes(DEFAULT_CONSTANTS, **overrides)
initialize_service_logging(service_name=SERVICE_NAME, config=config, root_path=root_path)

# Ensure SSL certificates are created if they aren't already there
create_all_ssl(
root_path=root_path,
private_node_names=[SERVICE_NAME],
public_node_names=[SERVICE_NAME],
overwrite=False,
)

service = create_solver_service(root_path, config, updated_constants)
async with SignalHandlers.manage() as signal_handlers:
await service.setup_process_global_state(signal_handlers=signal_handlers)
Expand All @@ -94,8 +104,7 @@ def main() -> int:
with maybe_manage_task_instrumentation(
enable=os.environ.get(f"CHIA_INSTRUMENT_{SERVICE_NAME.upper()}") is not None
):
service_config = load_config_cli(root_path, "config.yaml", SERVICE_NAME)
return async_run(coro=async_main(service_config, root_path=root_path))
return async_run(coro=async_main(root_path=root_path))


if __name__ == "__main__":
Expand Down
Loading