name change, fix comments

Author: almogdepaz

chia/_tests/farmer_harvester/test_farmer_harvester.py

@@ -326,15 +326,15 @@ async def test_harvester_has_no_server(
 
 
 @pytest.mark.anyio
-async def test_v2_qualities_new_sp_hash(
+async def test_v2_quality_chains_new_sp_hash(
     farmer_one_harvester_solver: tuple[list[HarvesterService], FarmerService, SolverService, BlockTools],
 ) -> None:
     _, farmer_service, _solver_service, _bt = farmer_one_harvester_solver
     farmer_api = farmer_service._api
     farmer = farmer_api.farmer
 
     sp_hash = bytes32(b"1" * 32)
-    v2_qualities = harvester_protocol.V2Qualities(
+    v2_quality_chains = harvester_protocol.V2QualityChains(
         challenge_hash=bytes32(b"2" * 32),
         sp_hash=sp_hash,
         plot_identifier="test_plot_id",
@@ -348,23 +348,23 @@ async def test_v2_qualities_new_sp_hash(
     )
 
     harvester_peer = await get_harvester_peer(farmer)
-    await farmer_api.v2_qualities(v2_qualities, harvester_peer)
+    await farmer_api.v2_quality_chains(v2_quality_chains, harvester_peer)
 
     assert sp_hash in farmer.number_of_responses
     assert farmer.number_of_responses[sp_hash] == 0
     assert sp_hash in farmer.cache_add_time
 
 
 @pytest.mark.anyio
-async def test_v2_qualities_missing_sp_hash(
+async def test_v2_quality_chains_missing_sp_hash(
     caplog: pytest.LogCaptureFixture,
     farmer_one_harvester_solver: tuple[list[HarvesterService], FarmerService, SolverService, BlockTools],
 ) -> None:
     _, farmer_service, _, _ = farmer_one_harvester_solver
     farmer_api = farmer_service._api
 
     sp_hash = bytes32(b"1" * 32)
-    v2_qualities = harvester_protocol.V2Qualities(
+    v2_quality_chains = harvester_protocol.V2QualityChains(
         challenge_hash=bytes32(b"2" * 32),
         sp_hash=sp_hash,
         plot_identifier="test_plot_id",
@@ -378,13 +378,13 @@ async def test_v2_qualities_missing_sp_hash(
     )
 
     harvester_peer = await get_harvester_peer(farmer_api.farmer)
-    await farmer_api.v2_qualities(v2_qualities, harvester_peer)
+    await farmer_api.v2_quality_chains(v2_quality_chains, harvester_peer)
 
     assert f"Received V2 quality collection for a signage point that we do not have {sp_hash}" in caplog.text
 
 
 @pytest.mark.anyio
-async def test_v2_qualities_with_existing_sp(
+async def test_v2_quality_chains_with_existing_sp(
     farmer_one_harvester_solver: tuple[list[HarvesterService], FarmerService, SolverService, BlockTools],
 ) -> None:
     _, farmer_service, _, _ = farmer_one_harvester_solver
@@ -407,7 +407,7 @@ async def test_v2_qualities_with_existing_sp(
 
     farmer.sps[sp_hash] = [sp]
 
-    v2_qualities = harvester_protocol.V2Qualities(
+    v2_quality_chains = harvester_protocol.V2QualityChains(
         challenge_hash=challenge_hash,
         sp_hash=sp_hash,
         plot_identifier="test_plot_id",
@@ -421,7 +421,7 @@ async def test_v2_qualities_with_existing_sp(
     )
 
     harvester_peer = await get_harvester_peer(farmer)
-    await farmer_api.v2_qualities(v2_qualities, harvester_peer)
+    await farmer_api.v2_quality_chains(v2_quality_chains, harvester_peer)
 
     # should store 2 pending requests (one per quality)
     assert len(farmer.pending_solver_requests) == 2
@@ -441,7 +441,7 @@ async def test_solution_response_handler(
     sp_hash = bytes32(b"1" * 32)
     challenge_hash = bytes32(b"2" * 32)
 
-    v2_qualities = harvester_protocol.V2Qualities(
+    v2_quality_chains = harvester_protocol.V2QualityChains(
         challenge_hash=challenge_hash,
         sp_hash=sp_hash,
         plot_identifier="test_plot_id",
@@ -458,7 +458,7 @@ async def test_solution_response_handler(
 
     # manually add pending request
     farmer.pending_solver_requests[quality] = {
-        "quality_data": v2_qualities,
+        "quality_data": v2_quality_chains,
         "peer": harvester_peer,
     }
 
@@ -509,7 +509,7 @@ async def test_solution_response_unknown_quality(
 async def test_solution_response_empty_proof(
     farmer_one_harvester_solver: tuple[list[HarvesterService], FarmerService, SolverService, BlockTools],
 ) -> None:
-    """Test solution_response with empty proof (line 555-556)."""
+    """Test solution_response with empty proof."""
     _, farmer_service, _solver_service, _ = farmer_one_harvester_solver
     farmer_api = farmer_service._api
     farmer = farmer_api.farmer
@@ -519,7 +519,7 @@ async def test_solution_response_empty_proof(
     sp_hash = bytes32(b"1" * 32)
     challenge_hash = bytes32(b"2" * 32)
 
-    v2_qualities = harvester_protocol.V2Qualities(
+    v2_quality_chains = harvester_protocol.V2QualityChains(
         challenge_hash=challenge_hash,
         sp_hash=sp_hash,
         plot_identifier="test_plot_id",
@@ -537,7 +537,7 @@ async def test_solution_response_empty_proof(
 
     # manually add pending request
     farmer.pending_solver_requests[quality] = {
-        "quality_data": v2_qualities,
+        "quality_data": v2_quality_chains,
         "peer": harvester_peer,
     }
 
@@ -558,10 +558,10 @@ async def test_solution_response_empty_proof(
 
 
 @pytest.mark.anyio
-async def test_v2_qualities_solver_exception(
+async def test_v2_quality_chains_solver_exception(
     farmer_one_harvester_solver: tuple[list[HarvesterService], FarmerService, SolverService, BlockTools],
 ) -> None:
-    """Test v2_qualities with solver service exception (lines 526-527, 529-530)."""
+    """Test v2_quality_chains with solver service exception."""
     _, farmer_service, _solver_service, _ = farmer_one_harvester_solver
     farmer_api = farmer_service._api
     farmer = farmer_api.farmer
@@ -582,7 +582,7 @@ async def test_v2_qualities_solver_exception(
 
     farmer.sps[sp_hash] = [sp]
 
-    v2_qualities = harvester_protocol.V2Qualities(
+    v2_quality_chains = harvester_protocol.V2QualityChains(
         challenge_hash=challenge_hash,
         sp_hash=sp_hash,
         plot_identifier="test_plot_id",
@@ -599,7 +599,7 @@ async def test_v2_qualities_solver_exception(
 
     # Mock send_to_all to raise an exception
     with unittest.mock.patch.object(farmer.server, "send_to_all", side_effect=Exception("Solver connection failed")):
-        await farmer_api.v2_qualities(v2_qualities, harvester_peer)
+        await farmer_api.v2_quality_chains(v2_quality_chains, harvester_peer)
 
         # verify pending request was cleaned up after exception
         quality = bytes32(b"3" * 32)

chia/_tests/util/test_network_protocol_test.py

@@ -189,7 +189,7 @@ def test_missing_messages() -> None:
         "RequestSignatures",
         "RespondPlots",
         "RespondSignatures",
-        "V2Qualities",
+        "V2QualityChains",
     }
 
     introducer_msgs = {"RequestPeersIntroducer", "RespondPeersIntroducer"}

chia/farmer/farmer_api.py

@@ -24,7 +24,7 @@
     PoolDifficulty,
     SignatureRequestSourceData,
     SigningDataKind,
-    V2Qualities,
+    V2QualityChains,
 )
 from chia.protocols.outbound_message import Message, NodeType, make_msg
 from chia.protocols.pool_protocol import (
@@ -481,10 +481,10 @@ async def new_proof_of_space(
                 return
 
     @metadata.request(peer_required=True)
-    async def v2_qualities(self, quality_data: V2Qualities, peer: WSChiaConnection) -> None:
+    async def v2_quality_chains(self, quality_data: V2QualityChains, peer: WSChiaConnection) -> None:
         """
-        This is a response from the harvester for V2 plots, containing only qualities.
-        We store these qualities and will later use solver service to generate proofs when needed.
+        This is a response from the harvester for V2 plots, containing only quality chains (partial proof bytes).
+        We send these to the solver service and wait for a response with the full proof.
         """
         if quality_data.sp_hash not in self.farmer.number_of_responses:
             self.farmer.number_of_responses[quality_data.sp_hash] = 0

chia/harvester/harvester_api.py

@@ -19,7 +19,7 @@
 from chia.plotting.util import PlotInfo, parse_plot_info
 from chia.protocols import harvester_protocol
 from chia.protocols.farmer_protocol import FarmingInfo
-from chia.protocols.harvester_protocol import Plot, PlotSyncResponse, V2Qualities
+from chia.protocols.harvester_protocol import Plot, PlotSyncResponse, V2QualityChains
 from chia.protocols.outbound_message import Message, make_msg
 from chia.protocols.protocol_message_types import ProtocolMessageTypes
 from chia.server.api_protocol import ApiMetadata
@@ -98,8 +98,8 @@ async def new_signage_point_harvester(
 
         loop = asyncio.get_running_loop()
 
-        def blocking_lookup_v2_qualities(filename: Path, plot_info: PlotInfo) -> Optional[V2Qualities]:
-            # Uses the V2 Prover object to lookup qualities only. No full proofs generated.
+        def blocking_lookup_v2_quality_chains(filename: Path, plot_info: PlotInfo) -> Optional[V2QualityChains]:
+            # Uses the V2 Prover object to lookup qualitie_chains (partial proofs).
             try:
                 plot_id = plot_info.prover.get_id()
                 sp_challenge_hash = calculate_pos_challenge(
@@ -128,7 +128,7 @@ def blocking_lookup_v2_qualities(filename: Path, plot_info: PlotInfo) -> Optiona
                     if len(quality_chains) > 0:
                         size = plot_info.prover.get_size().size_v2
                         assert size is not None
-                        return V2Qualities(
+                        return V2QualityChains(
                             new_challenge.challenge_hash,
                             new_challenge.sp_hash,
                             quality_chains[0].hex() + str(filename.resolve()),
@@ -263,14 +263,6 @@ def blocking_lookup(filename: Path, plot_info: PlotInfo) -> list[tuple[bytes32,
                 self.harvester.log.error(f"Unknown error: {e}")
                 return []
 
-        async def lookup_v2_qualities(filename: Path, plot_info: PlotInfo) -> tuple[Path, Optional[V2Qualities]]:
-            # Executes V2 quality lookup in a thread pool
-            if self.harvester._shut_down:
-                return filename, None
-            qualities: Optional[V2Qualities] = await loop.run_in_executor(
-                self.harvester.executor, blocking_lookup_v2_qualities, filename, plot_info
-            )
-            return filename, qualities
 
         async def lookup_challenge(
             filename: Path, plot_info: PlotInfo
@@ -309,7 +301,11 @@ async def lookup_challenge(
                 total += 1
                 if try_plot_info.prover.get_version() == PlotVersion.V2:
                     # TODO: todo_v2_plots need to check v2 filter
-                    v2_awaitables.append(lookup_v2_qualities(try_plot_filename, try_plot_info))
+                    v2_awaitables.append(
+                        loop.run_in_executor(
+                            self.harvester.executor, blocking_lookup_v2_quality_chains, try_plot_filename, try_plot_info
+                        )
+                    )
                     passed += 1
                 else:
                     filter_prefix_bits = calculate_prefix_bits(
@@ -330,7 +326,7 @@ async def lookup_challenge(
         # Concurrently executes all lookups on disk, to take advantage of multiple disk parallelism
         time_taken = time.monotonic() - start
         total_proofs_found = 0
-        total_v2_qualities_found = 0
+        total_v2_quality_chains_found = 0
 
         # Process V1 plot responses (existing flow)
         for filename_sublist_awaitable in asyncio.as_completed(awaitables):
@@ -350,17 +346,11 @@ async def lookup_challenge(
                 await peer.send_message(msg)
 
         # Process V2 plot quality collections (new flow)
-        for filename_quality_awaitable in asyncio.as_completed(v2_awaitables):
-            filename, v2_qualities = await filename_quality_awaitable
-            time_taken = time.monotonic() - start
-            if time_taken > 8:
-                self.harvester.log.warning(
-                    f"Looking up V2 qualities on {filename} took: {time_taken}. This should be below 8 seconds"
-                    f" to minimize risk of losing rewards."
-                )
-            if v2_qualities is not None:
-                total_v2_qualities_found += len(v2_qualities.quality_chains)
-                msg = make_msg(ProtocolMessageTypes.v2_qualities, v2_qualities)
+        for quality_awaitable in asyncio.as_completed(v2_awaitables):
+            v2_quality_chains = await quality_awaitable
+            if v2_quality_chains is not None:
+                total_v2_quality_chains_found += len(v2_quality_chains.quality_chains)
+                msg = make_msg(ProtocolMessageTypes.v2_quality_chains, v2_quality_chains)
                 await peer.send_message(msg)
 
         now = uint64(time.time())
@@ -380,7 +370,7 @@ async def lookup_challenge(
         self.harvester.log.info(
             f"challenge_hash: {new_challenge.challenge_hash.hex()[:10]} ..."
             f"{len(awaitables) + len(v2_awaitables)} plots were eligible for farming challenge"
-            f"Found {total_proofs_found} V1 proofs and {total_v2_qualities_found} V2 qualities."
+            f"Found {total_proofs_found} V1 proofs and {total_v2_quality_chains_found} V2 qualities."
             f" Time: {time_taken:.5f} s. Total {self.harvester.plot_manager.plot_count()} plots"
         )
         self.harvester.state_changed(
@@ -389,7 +379,7 @@ async def lookup_challenge(
                 "challenge_hash": new_challenge.challenge_hash.hex(),
                 "total_plots": self.harvester.plot_manager.plot_count(),
                 "found_proofs": total_proofs_found,
-                "found_v2_qualities": total_v2_qualities_found,
+                "found_v2_quality_chains": total_v2_quality_chains_found,
                 "eligible_plots": len(awaitables) + len(v2_awaitables),
                 "time": time_taken,
             },

chia/protocols/harvester_protocol.py

@@ -65,7 +65,7 @@ class NewProofOfSpace(Streamable):
 
 @streamable
 @dataclass(frozen=True)
-class V2Qualities(Streamable):
+class V2QualityChains(Streamable):
     challenge_hash: bytes32
     sp_hash: bytes32
     plot_identifier: str

chia/protocols/protocol_message_types.py

@@ -13,7 +13,7 @@ class ProtocolMessageTypes(Enum):
     new_proof_of_space = 5
     request_signatures = 6
     respond_signatures = 7
-    v2_qualities = 110
+    v2_quality_chains = 110
 
     # Farmer protocol (farmer <-> full_node)
     new_signage_point = 8