chia-blockchain 2.5.7rc2__py3-none-any.whl → 2.5.7rc4__py3-none-any.whl

chia/farmer/start_farmer.py

@@ -18,6 +18,7 @@ from chia.protocols.outbound_message import NodeType
 from chia.server.resolve_peer_info import get_unresolved_peer_infos
 from chia.server.signal_handlers import SignalHandlers
 from chia.server.start_service import RpcInfo, Service, async_run
+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
@@ -37,6 +38,7 @@ def create_farmer_service(
     consensus_constants: ConsensusConstants,
     keychain: Optional[Keychain] = None,
     connect_to_daemon: bool = True,
+    solver_peer: Optional[UnresolvedPeerInfo] = None,
 ) -> FarmerService:
     service_config = config[SERVICE_NAME]
 
@@ -54,6 +56,10 @@ def create_farmer_service(
     if service_config.get("start_rpc_server", True):
         rpc_info = (FarmerRpcApi, service_config["rpc_port"])
 
+    connect_peers = get_unresolved_peer_infos(service_config, NodeType.FULL_NODE)
+    if solver_peer is not None:
+        connect_peers.add(solver_peer)
+
     return Service(
         root_path=root_path,
         config=config,
@@ -62,8 +68,7 @@ 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)
-        | get_unresolved_peer_infos(service_config, NodeType.SOLVER),
+        connect_peers=connect_peers,
         on_connect_callback=node.on_connect,
         network_id=network_id,
         rpc_info=rpc_info,

chia/full_node/full_node_rpc_api.py

@@ -998,7 +998,7 @@ class FullNodeRpcApi:
 
         if peak is None:
             peak_height = uint32(0)
-            last_peak_timestamp = uint64(0)
+            last_peak_timestamp: Optional[uint64] = uint64(0)
             last_block_cost = 0
             fee_rate_last_block = 0.0
             last_tx_block_fees = uint64(0)
@@ -1011,7 +1011,6 @@ class FullNodeRpcApi:
             while last_tx_block is None or last_peak_timestamp is None:
                 peak_with_timestamp -= 1
                 last_tx_block = self.service.blockchain.height_to_block_record(peak_with_timestamp)
-                assert last_tx_block.timestamp is not None  # mypy
                 last_peak_timestamp = last_tx_block.timestamp
 
             assert last_tx_block is not None  # mypy

chia/simulator/setup_services.py

@@ -404,6 +404,7 @@ async def setup_farmer(
         consensus_constants,
         b_tools.local_keychain,
         connect_to_daemon=False,
+        solver_peer=solver_peer,
     )
 
     async with service.manage(start=start_service):

chia/util/service_groups.py

@@ -12,7 +12,6 @@ SERVICES_FOR_GROUP: dict[str, list[str]] = {
         "chia_wallet",
         "chia_data_layer",
         "chia_data_layer_http",
-        "chia_solver",
     ],
     "daemon": [],
     # TODO: should this be `data_layer`?
@@ -20,7 +19,7 @@ SERVICES_FOR_GROUP: dict[str, list[str]] = {
     "data_layer_http": ["chia_data_layer_http"],
     "node": ["chia_full_node"],
     "harvester": ["chia_harvester"],
-    "farmer": ["chia_harvester", "chia_farmer", "chia_full_node", "chia_wallet", "chia_solver"],
+    "farmer": ["chia_harvester", "chia_farmer", "chia_full_node", "chia_wallet"],
     "farmer-no-wallet": ["chia_harvester", "chia_farmer", "chia_full_node"],
     "farmer-only": ["chia_farmer"],
     "timelord": ["chia_timelord_launcher", "chia_timelord", "chia_full_node"],
@@ -32,7 +31,6 @@ SERVICES_FOR_GROUP: dict[str, list[str]] = {
     "crawler": ["chia_crawler"],
     "seeder": ["chia_crawler", "chia_seeder"],
     "seeder-only": ["chia_seeder"],
-    "solver": ["chia_solver"],
 }
 
 

{chia_blockchain-2.5.7rc2.dist-info → chia_blockchain-2.5.7rc4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chia-blockchain
-Version: 2.5.7rc2
+Version: 2.5.7rc4
 Summary: Chia blockchain full node, farmer, timelord, and wallet.
 License-Expression: Apache-2.0
 License-File: LICENSE

{chia_blockchain-2.5.7rc2.dist-info → chia_blockchain-2.5.7rc4.dist-info}/RECORD

@@ -636,7 +636,7 @@ chia/farmer/farmer_api.py,sha256=lGJOEskft0pquhxIM_rfhCCOEEKOR74pDWDa_ROy6m4,458
 chia/farmer/farmer_rpc_api.py,sha256=k4axJud0WYRB9xyM4QFlnktD-yXa-NK7fXBBMWZSjks,15275
 chia/farmer/farmer_rpc_client.py,sha256=5hqwaODAnv4Cvjcu9PsFKqXUrM5HfpuEZ0Z9o_43WEI,4179
 chia/farmer/farmer_service.py,sha256=k_tTERVZs9ezLwxXn1Vx_3cxqysx2Z31ieaw3tkKUTE,275
-chia/farmer/start_farmer.py,sha256=2K25vjnyJVEWfU31VHl6XSUzqs4d4ctBAqhiLnpexIE,3708
+chia/farmer/start_farmer.py,sha256=sJJmqExefGPB89leSylv6csfcf1wi4d0gK97sKrl098,3851
 chia/full_node/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chia/full_node/bitcoin_fee_estimator.py,sha256=XpxJS-FdDe-hCCOLBMQIhZIajgi65ztWW38rVq3nDnA,3600
 chia/full_node/block_store.py,sha256=n4Q6CLHnrq_po3XKkYiaUVVQYfXCmJ9wGcwUJJTOWl8,25000
@@ -654,7 +654,7 @@ chia/full_node/fee_tracker.py,sha256=H83i9nZw7ygfC_cRtgQMXWdCOXQjC3QRzJHJ7kjcRaA
 chia/full_node/full_block_utils.py,sha256=yy9HEv387H7mqbL2G9IiTXOGNlilgkMdPIpOafORSxQ,13241
 chia/full_node/full_node.py,sha256=XAP4f5WQdXbF8iVY98okHB_MV5KpkDlYKkWGmSHE3Yw,167781
 chia/full_node/full_node_api.py,sha256=fCwzb6KPWnFGj1JK2sCKuQwGXb_v2VFpx_ZDNM2PVgc,97473
-chia/full_node/full_node_rpc_api.py,sha256=o8tnoDnJ021FmvkezEu-OiyeN7fkWhhg0i6O9UUIDEk,48619
+chia/full_node/full_node_rpc_api.py,sha256=_uqvk8XlzkcdkEXeMUdhCyJeUqD4pHl_swwQok4vYqU,48570
 chia/full_node/full_node_rpc_client.py,sha256=QgCo5EUI3Bt7sfQw5gHI8G_gSI0l3JFIBbkY1qm39iM,13479
 chia/full_node/full_node_service.py,sha256=fD3mAV3Ud74MNl4g9xCnkhw_QIb4MwOGkoQKngVMiWA,307
 chia/full_node/full_node_store.py,sha256=uCVYo3ZPSb3Wqs4eDwqrUSYb-Mo9ARdven-5SvFgG78,48118
@@ -758,7 +758,7 @@ chia/simulator/add_blocks_in_batches.py,sha256=UyvNUB5KE5L37DaZ1o2Iap8vDiRmTpBlz
 chia/simulator/block_tools.py,sha256=iBJ8ChSIK4LouBsA7T9CWtG54Uw477WLi3dnsfMtXAc,92652
 chia/simulator/full_node_simulator.py,sha256=F87O_BnQJVUOgHfOcCtawxLamjsgHAkFTEMktGnDOqc,36022
 chia/simulator/keyring.py,sha256=RcumEHJy51zKeK0MZr7iqlugF8vPNRJvXDzXUgQ3y2A,5067
-chia/simulator/setup_services.py,sha256=wRgowJUKaj-5xHLh0Lm_lIezvVMRhkDLTOIRc7VQbeM,20748
+chia/simulator/setup_services.py,sha256=y7NOjLX3bLAoIn42GGVkio52iu_GYoXxZ74vi1A-nzc,20781
 chia/simulator/simulator_full_node_rpc_api.py,sha256=9y0F80nul2BVht9uKKoPT8jKXdaAvQp6afkZX-lEWmc,5463
 chia/simulator/simulator_full_node_rpc_client.py,sha256=paw9zQAaSoptG3vEcFxPvhuiQRiN7qz2NtzPwkFEumc,2946
 chia/simulator/simulator_protocol.py,sha256=miP02jjGmw2rLMM7nPn9wOWlbZllBEP_EZcaBatiB3E,612
@@ -872,7 +872,7 @@ chia/util/priority_mutex.py,sha256=IK0XJF68BNvfPvATpysRIgN7TaQ1EVNnbRWvdO11uyE,2
 chia/util/profiler.py,sha256=aVltWCzjPcKbZz3PfB2iL5LD-s2xTQqGth2HpGhficQ,7266
 chia/util/recursive_replace.py,sha256=qMXkjdl9luE8N4D800gBfGz6ZnHvnHLi3JPKCmvCfjc,945
 chia/util/safe_cancel_task.py,sha256=c7RITEqacFftfxpKCvErD5yT4HDZjERfK6H-t9MrFsY,413
-chia/util/service_groups.py,sha256=Nsv2AfmgxXG_3_oUbtsylmcLRLDgcQAWLMg9RkC3q6o,1613
+chia/util/service_groups.py,sha256=NlYYJg2xJqSWjBzFh4tyRVom36LkJj1p4MChbkh-33Y,1544
 chia/util/setproctitle.py,sha256=ortw3_B1J1jhD8mG1_twHPsJxGZvLQ3LbAAkB_Q4N4U,417
 chia/util/significant_bits.py,sha256=IVH8ZnuxSS152YUcS6hPSHg95pL9m82rsJbAAf2ex8Y,1009
 chia/util/streamable.py,sha256=ZwhmbQf1s-ch4sg2H2qRFc-G95Gxlq9fklmXD9hmVW8,26890
@@ -1019,8 +1019,8 @@ chia/wallet/wallet_transaction_store.py,sha256=2O4oFBjLUsdN_QI55GdCO6Br4YtCrYX_m
 chia/wallet/wallet_user_store.py,sha256=rXiQpk5g8t1X0Chx0bValcQsHonjB1oQ_F_K16bphDA,4089
 chia/wallet/wallet_weight_proof_handler.py,sha256=IcQg_w8EPjpS9xwmEE8GvPcneLePOtu74wWUu1l5uuM,4875
 chia/wallet/wsm_apis.py,sha256=6LmxbHXC-tqNbRyoiGgz-f19PF1nEfMbfm3BTnsNQ6s,3914
-chia_blockchain-2.5.7rc2.dist-info/METADATA,sha256=BpKNNbE3CVIyj56cVzeNukNF-T6O6vlHQdrmm_tmV_g,10319
-chia_blockchain-2.5.7rc2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-chia_blockchain-2.5.7rc2.dist-info/entry_points.txt,sha256=ehxlhrA6j4WmQ3W1pZ4GZEX9KCyrmuTsk9c_BNF9NUM,800
-chia_blockchain-2.5.7rc2.dist-info/licenses/LICENSE,sha256=0tuU-jTzeRDJJaxF2YCEpBwbywgpbrVSXq1i6fJq63U,11347
-chia_blockchain-2.5.7rc2.dist-info/RECORD,,
+chia_blockchain-2.5.7rc4.dist-info/METADATA,sha256=7RX5B_Q2CzcQ904Omjwq3PqhMIZmrQSFZuyoyFNqeGw,10319
+chia_blockchain-2.5.7rc4.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+chia_blockchain-2.5.7rc4.dist-info/entry_points.txt,sha256=ehxlhrA6j4WmQ3W1pZ4GZEX9KCyrmuTsk9c_BNF9NUM,800
+chia_blockchain-2.5.7rc4.dist-info/licenses/LICENSE,sha256=0tuU-jTzeRDJJaxF2YCEpBwbywgpbrVSXq1i6fJq63U,11347
+chia_blockchain-2.5.7rc4.dist-info/RECORD,,