v2 plots only support pool contract puzzle hash

Author: arvidn

chia/consensus/block_header_validation.py

@@ -756,10 +756,15 @@ def validate_unfinished_header_block(
             != constants.GENESIS_PRE_FARM_FARMER_PUZZLE_HASH
         ):
             return None, ValidationError(Err.INVALID_PREFARM)
-    # 20b. If pospace has a pool pk, heck pool target signature. Should not check this for genesis block.
+    # 20b. If pospace has a pool pk, check pool target signature. Should not check this for genesis block.
     elif header_block.reward_chain_block.proof_of_space.pool_public_key is not None:
         assert header_block.reward_chain_block.proof_of_space.pool_contract_puzzle_hash is None
         assert header_block.foliage.foliage_block_data.pool_signature is not None
+
+        # v2 plots require pool contract puzzle hash, not pool pk
+        if header_block.reward_chain_block.proof_of_space.size().size_v2 is not None:
+            return None, ValidationError(Err.INVALID_POOL_SIGNATURE)
+
         if not AugSchemeMPL.verify(
             header_block.reward_chain_block.proof_of_space.pool_public_key,
             bytes(header_block.foliage.foliage_block_data.pool_target),

chia/types/blockchain_format/proof_of_space.py

@@ -49,6 +49,8 @@ def make_pos(
         k = version_and_size.size_v1
     else:
         assert version_and_size.size_v2 is not None
+        # v2 plots only support pool contract puzzle hash, not pool pk
+        assert pool_contract_puzzle_hash is not None
         k = version_and_size.size_v2
         assert k is not None
         k |= 0x80
@@ -64,6 +66,11 @@ def make_pos(
 
 
 def get_plot_id(pos: ProofOfSpace) -> bytes32:
+    plot_size = pos.size()
+    if plot_size.size_v2 is not None:
+        assert pos.pool_contract_puzzle_hash is not None
+        return calculate_plot_id_v2(pos.pool_contract_puzzle_hash, pos.plot_public_key, plot_size.size_v2)
+
     assert pos.pool_public_key is None or pos.pool_contract_puzzle_hash is None
     if pos.pool_public_key is None:
         assert pos.pool_contract_puzzle_hash is not None
@@ -114,6 +121,10 @@ def verify_and_get_quality_string(
         return None
 
     plot_size = pos.size()
+    if plot_size.size_v2 is not None and pos.pool_contract_puzzle_hash is None:
+        log.error("v2 plots require pool_contract_puzzle_hash, pool public key is not supported")
+        return None
+
     if not check_plot_size(constants, plot_size):
         return None
 
@@ -204,6 +215,14 @@ def calculate_pos_challenge(plot_id: bytes32, challenge_hash: bytes32, signage_p
     return std_hash(calculate_plot_filter_input(plot_id, challenge_hash, signage_point))
 
 
+def calculate_plot_id_v2(
+    pool_contract_puzzle_hash: bytes32,
+    plot_public_key: G1Element,
+    strength: uint8,
+) -> bytes32:
+    return std_hash(bytes(pool_contract_puzzle_hash) + bytes(plot_public_key) + bytes(strength))
+
+
 def calculate_plot_id_pk(
     pool_public_key: G1Element,
     plot_public_key: G1Element,