remove use of pool_reward_puzzle_hash in full_node_simulator

Author: arvidn

chia/simulator/full_node_simulator.py

@@ -237,12 +237,17 @@ async def farm_new_transaction_block(
 
             current_blocks = await self.get_all_full_blocks()
             target = request.puzzle_hash
+            pool_target: bytes32 | None = target
+            if current_blocks[-1].height >= self.full_node.constants.HARD_FORK2_HEIGHT - 1:
+                # v2 plots (which we start farming at the hard fork activation)
+                # don't support specifying the pool target
+                pool_target = None
             more = self.bt.get_consecutive_blocks(
                 1,
                 time_per_block=time_per_block,
                 transaction_data=spend_bundle,
                 farmer_reward_puzzle_hash=target,
-                pool_reward_puzzle_hash=target,
+                pool_reward_puzzle_hash=pool_target,
                 block_list_input=current_blocks,
                 guarantee_transaction_block=True,
                 current_time=current_time,
@@ -289,11 +294,16 @@ async def farm_new_block(self, request: FarmNewBlockProtocol, force_wait_for_tim
                 spend_bundle = mempool_bundle[0]
             current_blocks = await self.get_all_full_blocks()
             target = request.puzzle_hash
+            pool_target: bytes32 | None = target
+            if current_blocks[-1].height >= self.full_node.constants.HARD_FORK2_HEIGHT - 1:
+                # v2 plots (which we start farming at the hard fork activation)
+                # don't support specifying the pool target
+                pool_target = None
             more = self.bt.get_consecutive_blocks(
                 1,
                 transaction_data=spend_bundle,
                 farmer_reward_puzzle_hash=target,
-                pool_reward_puzzle_hash=target,
+                pool_reward_puzzle_hash=pool_target,
                 block_list_input=current_blocks,
                 current_time=current_time,
                 time_per_block=time_per_block,
@@ -311,10 +321,15 @@ async def reorg_from_index_to_new_index(self, request: ReorgProtocol):
         current_blocks = await self.get_all_full_blocks()
         block_count = new_index - old_index
 
+        pool_target: bytes32 | None = coinbase_ph
+        if current_blocks[-1].height >= self.full_node.constants.HARD_FORK2_HEIGHT - 1:
+            # v2 plots (which we start farming at the hard fork activation)
+            # don't support specifying the pool target
+            pool_target = None
         more_blocks = self.bt.get_consecutive_blocks(
             block_count,
             farmer_reward_puzzle_hash=coinbase_ph,
-            pool_reward_puzzle_hash=coinbase_ph,
+            pool_reward_puzzle_hash=pool_target,
             block_list_input=current_blocks[: old_index + 1],
             force_overflow=True,
             guarantee_transaction_block=True,
@@ -398,12 +413,19 @@ async def farm_blocks_to_wallet(
             rewards = 0
 
             block_reward_coins = set()
-            expected_reward_coin_count = 2 * count
 
             original_peak_height = self.full_node.blockchain.get_peak_height()
             expected_peak_height = 0 if original_peak_height is None else original_peak_height
             extra_blocks = [[False, False]] if original_peak_height is None else []  # Farm genesis block first
 
+            if expected_peak_height >= self.full_node.constants.HARD_FORK2_HEIGHT - 1:
+                # v2 plots (which we start farming at the hard fork activation)
+                # don't support specifying the pool target, so we only get the
+                # farmer reward, not the pool reward
+                expected_reward_coin_count = count
+            else:
+                expected_reward_coin_count = 2 * count
+
             for to_wallet, tx_block in [*extra_blocks, *([[True, False]] * (count - 1)), [True, True], [False, True]]:
                 # This complicated application of the last two blocks being transaction
                 # blocks is due to the transaction blocks only including rewards from