Include removals in declare_proof_of_space (#19364)

Author: Rigidity

chia/_tests/core/mempool/test_mempool.py

@@ -2959,7 +2959,7 @@ async def local_get_unspent_lineage_info(ph: bytes32) -> Optional[UnspentLineage
 
     result = await mempool.create_block_generator(local_get_unspent_lineage_info, DEFAULT_CONSTANTS, uint32(10))
     assert result is not None
-    generator, _, _ = result
+    generator, _, _, _ = result
 
     assert called == 3
     assert generator.program == SerializedProgram.from_bytes(bytes.fromhex("ff01ff8080"))
@@ -3249,7 +3249,7 @@ async def get_unspent_lineage_info_for_puzzle_hash(_: bytes32) -> Optional[Unspe
 
     block = await mempool.create_block_generator(get_unspent_lineage_info_for_puzzle_hash, test_constants, uint32(0))
     assert block is not None
-    generator, signature, additions = block
+    generator, signature, additions, _ = block
 
     assert set(additions) == expected_additions
 

chia/full_node/full_node_api.py

@@ -865,7 +865,7 @@ async def declare_proof_of_space(
                     try:
                         block = await self.full_node.mempool_manager.create_block_generator(curr_l_tb.header_hash)
                         if block is not None:
-                            block_generator, aggregate_signature, additions = block
+                            block_generator, aggregate_signature, additions, removals = block
                     except Exception as e:
                         self.log.error(f"Traceback: {traceback.format_exc()}")
                         self.full_node.log.error(f"Error making spend bundle {e} peak: {peak}")

chia/full_node/mempool.py

@@ -493,7 +493,7 @@ async def create_block_generator(
         constants: ConsensusConstants,
         height: uint32,
         item_inclusion_filter: Optional[Callable[[bytes32], bool]] = None,
-    ) -> Optional[tuple[BlockGenerator, G2Element, list[Coin]]]:
+    ) -> Optional[tuple[BlockGenerator, G2Element, list[Coin], list[Coin]]]:
         """
         height is needed in case we fast-forward a transaction and we need to
         re-run its puzzle.
@@ -525,6 +525,7 @@ async def create_block_generator(
             BlockGenerator(SerializedProgram.from_bytes(block_program), []),
             spend_bundle.aggregated_signature,
             additions,
+            removals,
         )
 
     async def create_bundle_from_mempool_items(

chia/full_node/mempool_manager.py

@@ -247,9 +247,9 @@ async def create_block_generator(
         self,
         last_tb_header_hash: bytes32,
         item_inclusion_filter: Optional[Callable[[bytes32], bool]] = None,
-    ) -> Optional[tuple[BlockGenerator, G2Element, list[Coin]]]:
+    ) -> Optional[tuple[BlockGenerator, G2Element, list[Coin], list[Coin]]]:
         """
-        Returns a block generator program, the aggregate signature and all additions, for a new block
+        Returns a block generator program, the aggregate signature and all additions and removals, for a new block
         """
         if self.peak is None or self.peak.header_hash != last_tb_header_hash:
             return None