Plot v2 quality string (#19769)

* add shortcuts for bytes32 and G1Element to test_proof_of_space.py to make it a bit easier to read

* introduce calculate_plot_difficulty(), for incrementing plot difficulty over time. Tweak the placeholder cut-over block heights to make it possible to test

* update verify_and_get_quality_string() to support more aspects of v2 plots. update the v2 proof verification stub to take plot difficulty. add plot filter test cases for v2 plots

* move some tests from weight-proof to proof-of-space

Author: arvidn

chia/_tests/core/custom_types/test_proof_of_space.py

@@ -5,13 +5,18 @@
 from typing import Optional
 
 import pytest
-from chia_rs import G1Element, ProofOfSpace
+from chia_rs import G1Element, PlotSize, ProofOfSpace
 from chia_rs.sized_bytes import bytes32, bytes48
 from chia_rs.sized_ints import uint8, uint32
 
 from chia._tests.util.misc import Marks, datacases
 from chia.consensus.default_constants import DEFAULT_CONSTANTS
-from chia.types.blockchain_format.proof_of_space import passes_plot_filter, verify_and_get_quality_string
+from chia.types.blockchain_format.proof_of_space import (
+    calculate_plot_difficulty,
+    calculate_prefix_bits,
+    passes_plot_filter,
+    verify_and_get_quality_string,
+)
 
 
 @dataclass
@@ -27,6 +32,15 @@ class ProofOfSpaceCase:
     marks: Marks = ()
 
 
+def g1(key: str) -> G1Element:
+    return G1Element.from_bytes_unchecked(bytes48.from_hexstr(key))
+
+
+def b32(key: str) -> bytes32:
+    return bytes32.from_hexstr(key)
+
+
+# TODO: todo_v2_plots more test cases
 @datacases(
     ProofOfSpaceCase(
         id="Neither pool public key nor pool contract puzzle hash",
@@ -70,37 +84,57 @@ class ProofOfSpaceCase:
     ),
     ProofOfSpaceCase(
         id="Not passing the plot filter with size 9",
-        pos_challenge=bytes32.from_hexstr("08b23cc2844dfb92d2eedaa705a1ce665d571ee753bd81cbb67b92caa6d34722"),
+        pos_challenge=b32("08b23cc2844dfb92d2eedaa705a1ce665d571ee753bd81cbb67b92caa6d34722"),
         plot_size=uint8(42),
-        pool_public_key=G1Element.from_bytes_unchecked(
-            bytes48.from_hexstr(
-                "b6449c2c68df97c19e884427e42ee7350982d4020571ead08732615ff39bd216bfd630b6460784982bec98b49fea79d0"
-            )
+        pool_public_key=g1(
+            "b6449c2c68df97c19e884427e42ee7350982d4020571ead08732615ff39bd216bfd630b6460784982bec98b49fea79d0"
         ),
-        plot_public_key=G1Element.from_bytes_unchecked(
-            bytes48.from_hexstr(
-                "b17d368f5400230b2b01464807825bf4163c5c159bd7d4465f935912e538ac9fb996dd9a9c479bd8aa6256bdca1fed96"
-            )
+        plot_public_key=g1(
+            "b17d368f5400230b2b01464807825bf4163c5c159bd7d4465f935912e538ac9fb996dd9a9c479bd8aa6256bdca1fed96"
         ),
         height=uint32(5495999),
         expected_error="Did not pass the plot filter",
     ),
     ProofOfSpaceCase(
         id="Passing the plot filter with size 8",
-        pos_challenge=bytes32.from_hexstr("08b23cc2844dfb92d2eedaa705a1ce665d571ee753bd81cbb67b92caa6d34722"),
+        pos_challenge=b32("08b23cc2844dfb92d2eedaa705a1ce665d571ee753bd81cbb67b92caa6d34722"),
         plot_size=uint8(42),
-        pool_public_key=G1Element.from_bytes_unchecked(
-            bytes48.from_hexstr(
-                "b6449c2c68df97c19e884427e42ee7350982d4020571ead08732615ff39bd216bfd630b6460784982bec98b49fea79d0"
-            )
+        pool_public_key=g1(
+            "b6449c2c68df97c19e884427e42ee7350982d4020571ead08732615ff39bd216bfd630b6460784982bec98b49fea79d0"
         ),
-        plot_public_key=G1Element.from_bytes_unchecked(
-            bytes48.from_hexstr(
-                "b17d368f5400230b2b01464807825bf4163c5c159bd7d4465f935912e538ac9fb996dd9a9c479bd8aa6256bdca1fed96"
-            )
+        plot_public_key=g1(
+            "b17d368f5400230b2b01464807825bf4163c5c159bd7d4465f935912e538ac9fb996dd9a9c479bd8aa6256bdca1fed96"
         ),
         height=uint32(5496000),
     ),
+    ProofOfSpaceCase(
+        id="v2 plot size 0",
+        pos_challenge=bytes32(b"1" * 32),
+        plot_size=uint8(0x80),
+        plot_public_key=G1Element(),
+        pool_public_key=G1Element(),
+        expected_error="Plot size is lower than the minimum",
+    ),
+    ProofOfSpaceCase(
+        id="v2 plot size 34",
+        pos_challenge=bytes32(b"1" * 32),
+        plot_size=uint8(0x80 | 34),
+        plot_public_key=G1Element(),
+        pool_public_key=G1Element(),
+        expected_error="Plot size is higher than the maximum",
+    ),
+    ProofOfSpaceCase(
+        id="Not passing the plot filter v2",
+        pos_challenge=b32("3d29ea79d19b3f7e99ebf764ae53697cbe143603909873946af6ab1ece606861"),
+        plot_size=uint8(0x80 | 32),
+        pool_public_key=g1(
+            "b6449c2c68df97c19e884427e42ee7350982d4020571ead08732615ff39bd216bfd630b6460784982bec98b49fea79d0"
+        ),
+        plot_public_key=g1(
+            "879526b4e7b616cfd64984d8ad140d0798b048392a6f11e2faf09054ef467ea44dc0dab5e5edb2afdfa850c5c8b629cc"
+        ),
+        expected_error="Did not pass the plot filter",
+    ),
 )
 def test_verify_and_get_quality_string(caplog: pytest.LogCaptureFixture, case: ProofOfSpaceCase) -> None:
     pos = ProofOfSpace(
@@ -114,41 +148,25 @@ def test_verify_and_get_quality_string(caplog: pytest.LogCaptureFixture, case: P
     quality_string = verify_and_get_quality_string(
         pos=pos,
         constants=DEFAULT_CONSTANTS,
-        original_challenge_hash=bytes32.from_hexstr(
-            "0x73490e166d0b88347c37d921660b216c27316aae9a3450933d3ff3b854e5831a"
-        ),
-        signage_point=bytes32.from_hexstr("0x7b3e23dbd438f9aceefa9827e2c5538898189987f49b06eceb7a43067e77b531"),
+        original_challenge_hash=b32("0x73490e166d0b88347c37d921660b216c27316aae9a3450933d3ff3b854e5831a"),
+        signage_point=b32("0x7b3e23dbd438f9aceefa9827e2c5538898189987f49b06eceb7a43067e77b531"),
         height=case.height,
     )
     assert quality_string is None
     assert len(caplog.text) == 0 if case.expected_error is None else case.expected_error in caplog.text
 
 
-# TODO: todo_v2_plots more test cases
 @datacases(
-    ProofOfSpaceCase(
-        id="v2 plot size 0",
-        pos_challenge=bytes32(b"1" * 32),
-        plot_size=uint8(0x80),
-        plot_public_key=G1Element(),
-        pool_public_key=G1Element(),
-        pool_contract_puzzle_hash=bytes32(b"1" * 32),
-        expected_error="Plot size is lower than the minimum",
-    ),
-    ProofOfSpaceCase(
-        id="v2 plot size 34",
-        pos_challenge=bytes32(b"1" * 32),
-        plot_size=uint8(0x80 | 34),
-        plot_public_key=G1Element(),
-        pool_public_key=G1Element(),
-        expected_error="Plot size is higher than the maximum",
-    ),
     ProofOfSpaceCase(
         id="v2 plot are not implemented",
-        pos_challenge=bytes32(b"1" * 32),
         plot_size=uint8(0x80 | 30),
-        plot_public_key=G1Element(),
-        pool_public_key=G1Element(),
+        pos_challenge=b32("47deb938e145d25d7b3b3c85ca9e3972b76c01aeeb78a02fe5d3b040d282317e"),
+        plot_public_key=g1(
+            "afa3aaf09c03885154be49216ee7fb2e4581b9c4a4d7e9cc402e27280bf0cfdbdf1b9ba674e301fd1d1450234b3b1868"
+        ),
+        pool_public_key=g1(
+            "b6449c2c68df97c19e884427e42ee7350982d4020571ead08732615ff39bd216bfd630b6460784982bec98b49fea79d0"
+        ),
         expected_error="NotImplementedError",
     ),
 )
@@ -168,20 +186,41 @@ def test_verify_and_get_quality_string_v2(caplog: pytest.LogCaptureFixture, case
         quality_string = verify_and_get_quality_string(
             pos=pos,
             constants=DEFAULT_CONSTANTS,
-            original_challenge_hash=bytes32.from_hexstr(
-                "0x73490e166d0b88347c37d921660b216c27316aae9a3450933d3ff3b854e5831a"
-            ),
-            signage_point=bytes32.from_hexstr("0x7b3e23dbd438f9aceefa9827e2c5538898189987f49b06eceb7a43067e77b531"),
+            original_challenge_hash=b32("0x73490e166d0b88347c37d921660b216c27316aae9a3450933d3ff3b854e5831a"),
+            signage_point=b32("0x7b3e23dbd438f9aceefa9827e2c5538898189987f49b06eceb7a43067e77b531"),
             height=case.height,
         )
-    except Exception as e:
+    except NotImplementedError as e:
         assert case.expected_error is not None
         assert case.expected_error in repr(e)
     else:
         assert quality_string is None
         assert len(caplog.text) == 0 if case.expected_error is None else case.expected_error in caplog.text
 
 
+@pytest.mark.parametrize(
+    "height, difficulty",
+    [
+        (0, 2),
+        (DEFAULT_CONSTANTS.HARD_FORK_HEIGHT, 2),
+        (DEFAULT_CONSTANTS.HARD_FORK2_HEIGHT, 2),
+        (DEFAULT_CONSTANTS.PLOT_DIFFICULTY_4_HEIGHT - 1, 2),
+        (DEFAULT_CONSTANTS.PLOT_DIFFICULTY_4_HEIGHT, 4),
+        (DEFAULT_CONSTANTS.PLOT_DIFFICULTY_5_HEIGHT - 1, 4),
+        (DEFAULT_CONSTANTS.PLOT_DIFFICULTY_5_HEIGHT, 5),
+        (DEFAULT_CONSTANTS.PLOT_DIFFICULTY_6_HEIGHT - 1, 5),
+        (DEFAULT_CONSTANTS.PLOT_DIFFICULTY_6_HEIGHT, 6),
+        (DEFAULT_CONSTANTS.PLOT_DIFFICULTY_7_HEIGHT - 1, 6),
+        (DEFAULT_CONSTANTS.PLOT_DIFFICULTY_7_HEIGHT, 7),
+        (DEFAULT_CONSTANTS.PLOT_DIFFICULTY_8_HEIGHT - 1, 7),
+        (DEFAULT_CONSTANTS.PLOT_DIFFICULTY_8_HEIGHT, 8),
+        (DEFAULT_CONSTANTS.PLOT_DIFFICULTY_8_HEIGHT + 1000000, 8),
+    ],
+)
+def test_calculate_plot_difficulty(height: uint32, difficulty: uint8) -> None:
+    assert calculate_plot_difficulty(DEFAULT_CONSTANTS, height) == difficulty
+
+
 class TestProofOfSpace:
     @pytest.mark.parametrize("prefix_bits", [DEFAULT_CONSTANTS.NUMBER_ZERO_BITS_PLOT_FILTER_V1, 8, 7, 6, 5, 1, 0])
     def test_can_create_proof(self, prefix_bits: int, seeded_random: random.Random) -> None:
@@ -200,3 +239,34 @@ def test_can_create_proof(self, prefix_bits: int, seeded_random: random.Random)
                 success_count += 1
 
         assert abs((success_count * target_filter / num_trials) - 1) < 0.35
+
+
+@pytest.mark.parametrize("height,expected", [(0, 3), (5496000, 2), (10542000, 1), (15592000, 0), (20643000, 0)])
+@pytest.mark.parametrize("plot_size", [PlotSize.make_v1(32), PlotSize.make_v2(28)])
+def test_calculate_prefix_bits_clamp_zero(height: uint32, expected: int, plot_size: PlotSize) -> None:
+    constants = DEFAULT_CONSTANTS.replace(NUMBER_ZERO_BITS_PLOT_FILTER_V1=uint8(3))
+    if plot_size.size_v2 is not None:
+        expected = constants.NUMBER_ZERO_BITS_PLOT_FILTER_V2
+    assert calculate_prefix_bits(constants, height, plot_size) == expected
+
+
+@pytest.mark.parametrize(
+    argnames=["height", "expected"],
+    argvalues=[
+        (0, 9),
+        (5495999, 9),
+        (5496000, 8),
+        (10541999, 8),
+        (10542000, 7),
+        (15591999, 7),
+        (15592000, 6),
+        (20642999, 6),
+        (20643000, 5),
+    ],
+)
+@pytest.mark.parametrize("plot_size", [PlotSize.make_v1(32), PlotSize.make_v2(28)])
+def test_calculate_prefix_bits_default(height: uint32, expected: int, plot_size: PlotSize) -> None:
+    constants = DEFAULT_CONSTANTS
+    if plot_size.size_v2 is not None:
+        expected = DEFAULT_CONSTANTS.NUMBER_ZERO_BITS_PLOT_FILTER_V2
+    assert calculate_prefix_bits(constants, height, plot_size) == expected

chia/_tests/weight_proof/test_weight_proof.py

@@ -3,16 +3,14 @@
 import pytest
 from chia_rs import BlockRecord, ConsensusConstants, FullBlock, HeaderBlock, SubEpochSummary
 from chia_rs.sized_bytes import bytes32
-from chia_rs.sized_ints import uint8, uint32
+from chia_rs.sized_ints import uint32
 
 from chia._tests.util.blockchain_mock import BlockchainMock
-from chia.consensus.default_constants import DEFAULT_CONSTANTS
 from chia.consensus.full_block_to_block_record import block_to_block_record
 from chia.consensus.generator_tools import get_block_header
 from chia.consensus.pot_iterations import validate_pospace_and_get_required_iters
 from chia.full_node.weight_proof import WeightProofHandler, _map_sub_epoch_summaries, _validate_summaries_weight
 from chia.simulator.block_tools import BlockTools
-from chia.types.blockchain_format.proof_of_space import calculate_prefix_bits
 
 
 async def load_blocks_dont_validate(
@@ -490,28 +488,3 @@ async def test_weight_proof_extend_multiple_ses(
         valid, fork_point, _ = await wpf.validate_weight_proof(new_wp)
         assert valid
         assert fork_point != 0
-
-
-@pytest.mark.parametrize("height,expected", [(0, 3), (5496000, 2), (10542000, 1), (15592000, 0), (20643000, 0)])
-def test_calculate_prefix_bits_clamp_zero(height: uint32, expected: int) -> None:
-    constants = DEFAULT_CONSTANTS.replace(NUMBER_ZERO_BITS_PLOT_FILTER_V1=uint8(3))
-    assert calculate_prefix_bits(constants, height) == expected
-
-
-@pytest.mark.parametrize(
-    argnames=["height", "expected"],
-    argvalues=[
-        (0, 9),
-        (5495999, 9),
-        (5496000, 8),
-        (10541999, 8),
-        (10542000, 7),
-        (15591999, 7),
-        (15592000, 6),
-        (20642999, 6),
-        (20643000, 5),
-    ],
-)
-def test_calculate_prefix_bits_default(height: uint32, expected: int) -> None:
-    constants = DEFAULT_CONSTANTS
-    assert calculate_prefix_bits(constants, height) == expected

chia/consensus/default_constants.py

@@ -30,7 +30,7 @@
         9
     ),  # H(plot signature of the challenge) must start with these many zeroes, for v1 plots
     NUMBER_ZERO_BITS_PLOT_FILTER_V2=uint8(
-        9
+        5
     ),  # H(plot signature of the challenge) must start with these many zeroes. for v2 plots
     MIN_PLOT_SIZE_V1=uint8(32),  # 32 for mainnet
     MAX_PLOT_SIZE_V1=uint8(50),
@@ -81,18 +81,18 @@
     POOL_SUB_SLOT_ITERS=uint64(37600000000),  # iters limit * NUM_SPS
     # June 2024
     HARD_FORK_HEIGHT=uint32(5496000),
-    HARD_FORK2_HEIGHT=uint32(0xFFFFFFFF),
+    HARD_FORK2_HEIGHT=uint32(0xFFFFFFFA),
     # June 2027
     PLOT_FILTER_128_HEIGHT=uint32(10542000),
     # June 2030
     PLOT_FILTER_64_HEIGHT=uint32(15592000),
     # June 2033
     PLOT_FILTER_32_HEIGHT=uint32(20643000),
     PLOT_DIFFICULTY_INITIAL=uint8(2),
-    PLOT_DIFFICULTY_4_HEIGHT=uint32(0xFFFFFFFF),
-    PLOT_DIFFICULTY_5_HEIGHT=uint32(0xFFFFFFFF),
-    PLOT_DIFFICULTY_6_HEIGHT=uint32(0xFFFFFFFF),
-    PLOT_DIFFICULTY_7_HEIGHT=uint32(0xFFFFFFFF),
+    PLOT_DIFFICULTY_4_HEIGHT=uint32(0xFFFFFFFB),
+    PLOT_DIFFICULTY_5_HEIGHT=uint32(0xFFFFFFFC),
+    PLOT_DIFFICULTY_6_HEIGHT=uint32(0xFFFFFFFD),
+    PLOT_DIFFICULTY_7_HEIGHT=uint32(0xFFFFFFFE),
     PLOT_DIFFICULTY_8_HEIGHT=uint32(0xFFFFFFFF),
 )
 

chia/full_node/full_node_rpc_api.py

@@ -10,6 +10,7 @@
     BlockRecord,
     CoinSpend,
     FullBlock,
+    PlotSize,
     SpendBundle,
     SpendBundleConditions,
     run_block_generator2,
@@ -599,7 +600,9 @@ async def get_network_space(self, request: dict[str, Any]) -> EndpointResult:
             raise ValueError(f"Older block {older_block_hex} not found")
         delta_weight = newer_block.weight - older_block.weight
 
-        plot_filter_size = calculate_prefix_bits(self.service.constants, newer_block.height)
+        # TODO: todo_v2_plots Update this calculation to take v2 plots into
+        # account
+        plot_filter_size = calculate_prefix_bits(self.service.constants, newer_block.height, PlotSize.make_v1(32))
         delta_iters = newer_block.total_iters - older_block.total_iters
         weight_div_iters = delta_weight / delta_iters
         additional_difficulty_constant = self.service.constants.DIFFICULTY_CONSTANT_FACTOR

chia/harvester/harvester_api.py

@@ -249,7 +249,15 @@ async def lookup_challenge(
                 # Passes the plot filter (does not check sp filter yet though, since we have not reached sp)
                 # This is being executed at the beginning of the slot
                 total += 1
-                filter_prefix_bits = uint8(calculate_prefix_bits(self.harvester.constants, new_challenge.peak_height))
+
+                # TODO: todo_v2_plots support v2 plots in PlotManager
+                filter_prefix_bits = uint8(
+                    calculate_prefix_bits(
+                        self.harvester.constants,
+                        new_challenge.peak_height,
+                        PlotSize.make_v1(try_plot_info.prover.get_size()),
+                    )
+                )
                 if passes_plot_filter(
                     filter_prefix_bits,
                     try_plot_info.prover.get_id(),

chia/simulator/block_tools.py

@@ -1506,7 +1506,8 @@ def get_pospaces_for_challenge(
             plot_id: bytes32 = plot_info.prover.get_id()
             if force_plot_id is not None and plot_id != force_plot_id:
                 continue
-            prefix_bits = calculate_prefix_bits(constants, height)
+            # TODO: todo_v2_plots support v2 plots in the plot manager
+            prefix_bits = calculate_prefix_bits(constants, height, PlotSize.make_v1(plot_info.prover.get_size()))
             if passes_plot_filter(prefix_bits, plot_id, challenge_hash, signage_point):
                 new_challenge: bytes32 = calculate_pos_challenge(plot_id, challenge_hash, signage_point)
                 qualities = plot_info.prover.get_qualities_for_challenge(new_challenge)
@@ -1515,6 +1516,7 @@ def get_pospaces_for_challenge(
                     required_iters = calculate_iterations_quality(
                         constants,
                         quality_str,
+                        # TODO: todo_v2_plots support v2 plots in the plot manager
                         PlotSize.make_v1(plot_info.prover.get_size()),
                         difficulty,
                         signage_point,