Merge pull request #1314 from Chia-Network/bump-chia-pos2

arvidn · web-flow · commit edd5b0068051 · 2025-12-15T17:53:34.000+01:00
bump chia-pos2 to 0.1.6 along with updates for the new PoS
diff --git a/Cargo.lock b/Cargo.lock
@@ -456,9 +456,9 @@ dependencies = [
 
 [[package]]
 name = "chia-pos2"
-version = "0.1.4"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3013a7003399d43ac66c231b08649a7fd97d4f6399dbbd356360e76b5359af01"
+checksum = "d6fffd6779c3200ebbd552ba79566f2ff2ef5bed4f8975d0026e981b87103328"
 dependencies = [
  "cc",
  "serde",
@@ -472,6 +472,7 @@ dependencies = [
  "anyhow",
  "arbitrary",
  "chia-bls 0.35.0",
+ "chia-pos2",
  "chia-serde",
  "chia-sha2 0.35.0",
  "chia-traits 0.35.0",
diff --git a/Cargo.toml b/Cargo.toml
@@ -131,7 +131,7 @@ chia-serde = { path = "./crates/chia-serde", version = "0.35.0" }
 clvm-traits = { path = "./crates/clvm-traits", version = "0.35.0" }
 clvm-utils = { path = "./crates/clvm-utils", version = "0.35.0" }
 clvm-derive = { path = "./crates/clvm-derive", version = "0.35.0" }
-chia-pos2 = "0.1.4"
+chia-pos2 = "0.1.6"
 chia-consensus-fuzz = { path = "./crates/chia-consensus/fuzz", version = "0.35.0" }
 chia-bls-fuzz = { path = "./crates/chia-bls/fuzz", version = "0.35.0" }
 chia-datalayer-fuzz = { path = "./crates/chia-datalayer/fuzz", version = "0.35.0" }
diff --git a/crates/chia-consensus/src/consensus_constants.rs b/crates/chia-consensus/src/consensus_constants.rs
@@ -160,9 +160,6 @@ pub struct ConsensusConstants {
     min_plot_strength: u8,
     max_plot_strength: u8,
 
-    /// The quality proof scan filter for v2 plots
-    quality_proof_scan_filter: u8,
-
     plot_filter_v2_first_adjustment_height: u32,
     plot_filter_v2_second_adjustment_height: u32,
     plot_filter_v2_third_adjustment_height: u32,
@@ -241,8 +238,6 @@ pub const TEST_CONSTANTS: ConsensusConstants = ConsensusConstants {
     min_plot_strength: 2,
     max_plot_strength: 32,
 
-    quality_proof_scan_filter: 5,
-
     plot_filter_v2_first_adjustment_height: 0xffff_ffff, // placeholder
     plot_filter_v2_second_adjustment_height: 0xffff_ffff, // placeholder
     plot_filter_v2_third_adjustment_height: 0xffff_ffff, // placeholder
diff --git a/crates/chia-protocol/Cargo.toml b/crates/chia-protocol/Cargo.toml
@@ -27,6 +27,7 @@ chia_py_streamable_macro = { workspace = true, optional = true }
 clvmr = { workspace = true }
 chia-traits = { workspace = true }
 chia-sha2 = { workspace = true }
+chia-pos2 = { workspace = true }
 clvm-traits = { workspace = true, features = ["derive"] }
 clvm-utils = { workspace = true }
 chia-bls = { workspace = true }
diff --git a/crates/chia-protocol/src/partial_proof.rs b/crates/chia-protocol/src/partial_proof.rs
@@ -1,7 +1,30 @@
+use crate::Bytes32;
+use chia_pos2::serialize_quality;
+use chia_sha2::Sha256;
 use chia_streamable_macro::streamable;
 
+#[cfg(feature = "py-bindings")]
+use pyo3::pymethods;
+
 #[streamable]
 pub struct PartialProof {
     #[cfg_attr(feature = "serde", serde(with = "serde_arrays"))]
-    proof_fragments: [u64; 64],
+    fragments: [u64; 16],
+}
+
+impl PartialProof {
+    pub fn get_string(&self, strength: u8) -> Bytes32 {
+        let mut sha256 = Sha256::new();
+        sha256.update(serialize_quality(&self.fragments, strength));
+        sha256.finalize().into()
+    }
+}
+
+#[cfg(feature = "py-bindings")]
+#[pymethods]
+impl PartialProof {
+    #[pyo3(name = "get_string")]
+    fn py_get_string(&self, strength: u8) -> Bytes32 {
+        self.get_string(strength)
+    }
 }
diff --git a/tests/run_gen.py b/tests/run_gen.py
@@ -86,7 +86,6 @@
     PLOT_FILTER_32_HEIGHT=uint32(20643000),
     MIN_PLOT_STRENGTH=uint8(2),
     MAX_PLOT_STRENGTH=uint8(32),
-    QUALITY_PROOF_SCAN_FILTER=uint8(5),
     PLOT_FILTER_V2_FIRST_ADJUSTMENT_HEIGHT=uint32(0xFFFFFFFF),
     PLOT_FILTER_V2_SECOND_ADJUSTMENT_HEIGHT=uint32(0xFFFFFFFF),
     PLOT_FILTER_V2_THIRD_ADJUSTMENT_HEIGHT=uint32(0xFFFFFFFF),
diff --git a/tests/test_consensus_constants.py b/tests/test_consensus_constants.py
@@ -5,5 +5,5 @@ def test_formatting() -> None:
 
     assert (
         f"{DEFAULT_CONSTANTS}"
-        == "ConsensusConstants { SLOT_BLOCKS_TARGET: 32, MIN_BLOCKS_PER_CHALLENGE_BLOCK: 16, MAX_SUB_SLOT_BLOCKS: 128, NUM_SPS_SUB_SLOT: 64, SUB_SLOT_ITERS_STARTING: 134217728, DIFFICULTY_CONSTANT_FACTOR: 147573952589676412928, DIFFICULTY_STARTING: 7, DIFFICULTY_CHANGE_MAX_FACTOR: 3, SUB_EPOCH_BLOCKS: 384, EPOCH_BLOCKS: 4608, SIGNIFICANT_BITS: 8, DISCRIMINANT_SIZE_BITS: 1024, NUMBER_ZERO_BITS_PLOT_FILTER_V1: 9, NUMBER_ZERO_BITS_PLOT_FILTER_V2: 5, MIN_PLOT_SIZE_V1: 32, MAX_PLOT_SIZE_V1: 50, PLOT_SIZE_V2: 28, SUB_SLOT_TIME_TARGET: 600, NUM_SP_INTERVALS_EXTRA: 3, MAX_FUTURE_TIME2: 120, NUMBER_OF_TIMESTAMPS: 11, GENESIS_CHALLENGE: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855, AGG_SIG_ME_ADDITIONAL_DATA: ccd5bb71183532bff220ba46c268991a3ff07eb358e8255a65c30a2dce0e5fbb, AGG_SIG_PARENT_ADDITIONAL_DATA: baf5d69c647c91966170302d18521b0a85663433d161e72c826ed08677b53a74, AGG_SIG_PUZZLE_ADDITIONAL_DATA: 284fa2ef486c7a41cc29fc99c9d08376161e93dd37817edb8219f42dca7592c4, AGG_SIG_AMOUNT_ADDITIONAL_DATA: cda186a9cd030f7a130fae45005e81cae7a90e0fa205b75f6aebc0d598e0348e, AGG_SIG_PUZZLE_AMOUNT_ADDITIONAL_DATA: 0f7d90dff0613e6901e24dae59f1e690f18b8f5fbdcf1bb192ac9deaf7de22ad, AGG_SIG_PARENT_AMOUNT_ADDITIONAL_DATA: 585796bd90bb553c0430b87027ffee08d88aba0162c6e1abbbcc6b583f2ae7f9, AGG_SIG_PARENT_PUZZLE_ADDITIONAL_DATA: 2ebfdae17b29d83bae476a25ea06f0c4bd57298faddbbc3ec5ad29b9b86ce5df, GENESIS_PRE_FARM_POOL_PUZZLE_HASH: d23da14695a188ae5708dd152263c4db883eb27edeb936178d4d988b8f3ce5fc, GENESIS_PRE_FARM_FARMER_PUZZLE_HASH: 3d8765d3a597ec1d99663f6c9816d915b9f68613ac94009884c4addaefcce6af, MAX_VDF_WITNESS_SIZE: 64, MEMPOOL_BLOCK_BUFFER: 10, MAX_COIN_AMOUNT: 18446744073709551615, MAX_BLOCK_COST_CLVM: 11000000000, COST_PER_BYTE: 12000, WEIGHT_PROOF_THRESHOLD: 2, WEIGHT_PROOF_RECENT_BLOCKS: 1000, MAX_BLOCK_COUNT_PER_REQUESTS: 32, BLOCKS_CACHE_SIZE: 5120, MAX_GENERATOR_REF_LIST_SIZE: 512, POOL_SUB_SLOT_ITERS: 37600000000, HARD_FORK_HEIGHT: 5496000, HARD_FORK2_HEIGHT: 4294967295, PLOT_V1_PHASE_OUT_EPOCH_BITS: 8, PLOT_FILTER_128_HEIGHT: 10542000, PLOT_FILTER_64_HEIGHT: 15592000, PLOT_FILTER_32_HEIGHT: 20643000, MIN_PLOT_STRENGTH: 2, MAX_PLOT_STRENGTH: 32, QUALITY_PROOF_SCAN_FILTER: 5, PLOT_FILTER_V2_FIRST_ADJUSTMENT_HEIGHT: 4294967295, PLOT_FILTER_V2_SECOND_ADJUSTMENT_HEIGHT: 4294967295, PLOT_FILTER_V2_THIRD_ADJUSTMENT_HEIGHT: 4294967295, }"
+        == "ConsensusConstants { SLOT_BLOCKS_TARGET: 32, MIN_BLOCKS_PER_CHALLENGE_BLOCK: 16, MAX_SUB_SLOT_BLOCKS: 128, NUM_SPS_SUB_SLOT: 64, SUB_SLOT_ITERS_STARTING: 134217728, DIFFICULTY_CONSTANT_FACTOR: 147573952589676412928, DIFFICULTY_STARTING: 7, DIFFICULTY_CHANGE_MAX_FACTOR: 3, SUB_EPOCH_BLOCKS: 384, EPOCH_BLOCKS: 4608, SIGNIFICANT_BITS: 8, DISCRIMINANT_SIZE_BITS: 1024, NUMBER_ZERO_BITS_PLOT_FILTER_V1: 9, NUMBER_ZERO_BITS_PLOT_FILTER_V2: 5, MIN_PLOT_SIZE_V1: 32, MAX_PLOT_SIZE_V1: 50, PLOT_SIZE_V2: 28, SUB_SLOT_TIME_TARGET: 600, NUM_SP_INTERVALS_EXTRA: 3, MAX_FUTURE_TIME2: 120, NUMBER_OF_TIMESTAMPS: 11, GENESIS_CHALLENGE: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855, AGG_SIG_ME_ADDITIONAL_DATA: ccd5bb71183532bff220ba46c268991a3ff07eb358e8255a65c30a2dce0e5fbb, AGG_SIG_PARENT_ADDITIONAL_DATA: baf5d69c647c91966170302d18521b0a85663433d161e72c826ed08677b53a74, AGG_SIG_PUZZLE_ADDITIONAL_DATA: 284fa2ef486c7a41cc29fc99c9d08376161e93dd37817edb8219f42dca7592c4, AGG_SIG_AMOUNT_ADDITIONAL_DATA: cda186a9cd030f7a130fae45005e81cae7a90e0fa205b75f6aebc0d598e0348e, AGG_SIG_PUZZLE_AMOUNT_ADDITIONAL_DATA: 0f7d90dff0613e6901e24dae59f1e690f18b8f5fbdcf1bb192ac9deaf7de22ad, AGG_SIG_PARENT_AMOUNT_ADDITIONAL_DATA: 585796bd90bb553c0430b87027ffee08d88aba0162c6e1abbbcc6b583f2ae7f9, AGG_SIG_PARENT_PUZZLE_ADDITIONAL_DATA: 2ebfdae17b29d83bae476a25ea06f0c4bd57298faddbbc3ec5ad29b9b86ce5df, GENESIS_PRE_FARM_POOL_PUZZLE_HASH: d23da14695a188ae5708dd152263c4db883eb27edeb936178d4d988b8f3ce5fc, GENESIS_PRE_FARM_FARMER_PUZZLE_HASH: 3d8765d3a597ec1d99663f6c9816d915b9f68613ac94009884c4addaefcce6af, MAX_VDF_WITNESS_SIZE: 64, MEMPOOL_BLOCK_BUFFER: 10, MAX_COIN_AMOUNT: 18446744073709551615, MAX_BLOCK_COST_CLVM: 11000000000, COST_PER_BYTE: 12000, WEIGHT_PROOF_THRESHOLD: 2, WEIGHT_PROOF_RECENT_BLOCKS: 1000, MAX_BLOCK_COUNT_PER_REQUESTS: 32, BLOCKS_CACHE_SIZE: 5120, MAX_GENERATOR_REF_LIST_SIZE: 512, POOL_SUB_SLOT_ITERS: 37600000000, HARD_FORK_HEIGHT: 5496000, HARD_FORK2_HEIGHT: 4294967295, PLOT_V1_PHASE_OUT_EPOCH_BITS: 8, PLOT_FILTER_128_HEIGHT: 10542000, PLOT_FILTER_64_HEIGHT: 15592000, PLOT_FILTER_32_HEIGHT: 20643000, MIN_PLOT_STRENGTH: 2, MAX_PLOT_STRENGTH: 32, PLOT_FILTER_V2_FIRST_ADJUSTMENT_HEIGHT: 4294967295, PLOT_FILTER_V2_SECOND_ADJUSTMENT_HEIGHT: 4294967295, PLOT_FILTER_V2_THIRD_ADJUSTMENT_HEIGHT: 4294967295, }"
     )
diff --git a/tests/test_pos2.py b/tests/test_pos2.py
@@ -1,5 +1,6 @@
 from chia_rs import create_v2_plot, Prover, validate_proof_v2, solve_proof
 from chia_rs.sized_bytes import bytes32
+from chia_rs.sized_ints import uint8
 import random
 
 
@@ -10,7 +11,6 @@ def test_plot_roundtrip() -> None:
     )
     k = 18
     strength = 2
-    proof_fragment_scan_filter = 4
 
     create_v2_plot("k-18-test.plot", k, strength, plot_id, b" " * (64 + 48))
 
@@ -36,24 +36,18 @@ def test_plot_roundtrip() -> None:
         challenge = bytes32.random(rng)
         num_challenges += 1
 
-        quality_proofs = prover.get_qualities_for_challenge(
-            challenge, proof_fragment_scan_filter
-        )
-        if quality_proofs == []:
+        partial_proofs = prover.get_qualities_for_challenge(challenge)
+        if partial_proofs == []:
             continue
-        for qp in quality_proofs:
-            proof_fragments, s = prover.get_partial_proof(qp)
-            assert s == strength
-            full_proof = solve_proof(proof_fragments, plot_id, strength, k)
+        for pp in partial_proofs:
+            full_proof = solve_proof(pp, plot_id, strength, k)
 
             num_proofs += 1
-            quality = validate_proof_v2(
-                plot_id, k, challenge, strength, proof_fragment_scan_filter, full_proof
-            )
+            quality = validate_proof_v2(plot_id, k, challenge, strength, full_proof)
             assert quality is not None
-            assert quality == qp.serialize()
+            assert quality == pp.get_string(uint8(strength))
 
     print(f"challenges: {num_challenges}")
     print(f"proofs: {num_proofs}")
     assert num_challenges == 100
-    assert num_proofs == 50
+    assert num_proofs == 3
diff --git a/wheel/generate_type_stubs.py b/wheel/generate_type_stubs.py
@@ -204,6 +204,9 @@ def parse_rust_source(filename: str, upper_case: bool) -> list[tuple[str, list[s
 
 
 extra_members = {
+    "PartialProof": [
+        "def get_string(self, strength: uint8) -> bytes32: ...",
+    ],
     "Coin": [
         "def name(self) -> bytes32: ...",
     ],
@@ -502,16 +505,10 @@ def make_v2(s: int) -> PlotParam: ...
     size_v1: Optional[uint8]
     strength_v2: Optional[uint8]
 
-# Proof-of-space 2
-@final
-class QualityProof:
-   def serialize(self) -> bytes32: ...
-
 @final
 class Prover:
     def __new__(cls, plot_path: str) -> Prover: ...
-    def get_qualities_for_challenge(self, challenge: bytes32, proof_fragment_filter: int) -> list[QualityProof]: ...
-    def get_partial_proof(self, quality: QualityProof) -> tuple[PartialProof, int]: ...
+    def get_qualities_for_challenge(self, challenge: bytes32) -> list[PartialProof]: ...
     def size(self) -> int: ...
     def plot_id(self) -> bytes32: ...
     def get_strength(self) -> int: ...
@@ -528,7 +525,7 @@ def create_v2_plot(filename: str,
     memo: bytes,
 ) -> None: ...
 
-def validate_proof_v2(plot_id: bytes32, size: int, challenge: bytes32, required_plot_strength: int, proof_fragment_scan_filter: int, proof: bytes) -> Optional[bytes32]: ...
+def validate_proof_v2(plot_id: bytes32, size: int, challenge: bytes32, plot_strength: int, proof: bytes) -> Optional[bytes32]: ...
 
 def solve_proof(fragments: PartialProof, plot_id: bytes32, strength: int, k: int) -> bytes: ...
 
diff --git a/wheel/python/chia_rs/chia_rs.pyi b/wheel/python/chia_rs/chia_rs.pyi
@@ -200,16 +200,10 @@ class PlotParam:
     size_v1: Optional[uint8]
     strength_v2: Optional[uint8]
 
-# Proof-of-space 2
-@final
-class QualityProof:
-   def serialize(self) -> bytes32: ...
-
 @final
 class Prover:
     def __new__(cls, plot_path: str) -> Prover: ...
-    def get_qualities_for_challenge(self, challenge: bytes32, proof_fragment_filter: int) -> list[QualityProof]: ...
-    def get_partial_proof(self, quality: QualityProof) -> tuple[PartialProof, int]: ...
+    def get_qualities_for_challenge(self, challenge: bytes32) -> list[PartialProof]: ...
     def size(self) -> int: ...
     def plot_id(self) -> bytes32: ...
     def get_strength(self) -> int: ...
@@ -226,7 +220,7 @@ def create_v2_plot(filename: str,
     memo: bytes,
 ) -> None: ...
 
-def validate_proof_v2(plot_id: bytes32, size: int, challenge: bytes32, required_plot_strength: int, proof_fragment_scan_filter: int, proof: bytes) -> Optional[bytes32]: ...
+def validate_proof_v2(plot_id: bytes32, size: int, challenge: bytes32, plot_strength: int, proof: bytes) -> Optional[bytes32]: ...
 
 def solve_proof(fragments: PartialProof, plot_id: bytes32, strength: int, k: int) -> bytes: ...
 
@@ -2086,10 +2080,11 @@ class HeaderBlock:
 
 @final
 class PartialProof:
-    proof_fragments: list[uint64]
+    fragments: list[uint64]
+    def get_string(self, strength: uint8) -> bytes32: ...
     def __new__(
         cls,
-        proof_fragments: Sequence[uint64]
+        fragments: Sequence[uint64]
     ) -> PartialProof: ...
     def __hash__(self) -> int: ...
     def __repr__(self) -> str: ...
@@ -2108,7 +2103,7 @@ class PartialProof:
     def to_json_dict(self) -> dict[str, Any]: ...
     @classmethod
     def from_json_dict(cls, json_dict: dict[str, Any]) -> Self: ...
-    def replace(self, *, proof_fragments: Union[ list[uint64], _Unspec] = _Unspec()) -> PartialProof: ...
+    def replace(self, *, fragments: Union[ list[uint64], _Unspec] = _Unspec()) -> PartialProof: ...
 
 @final
 class TimestampedPeerInfo:
@@ -4528,7 +4523,6 @@ class ConsensusConstants:
     PLOT_FILTER_32_HEIGHT: uint32
     MIN_PLOT_STRENGTH: uint8
     MAX_PLOT_STRENGTH: uint8
-    QUALITY_PROOF_SCAN_FILTER: uint8
     PLOT_FILTER_V2_FIRST_ADJUSTMENT_HEIGHT: uint32
     PLOT_FILTER_V2_SECOND_ADJUSTMENT_HEIGHT: uint32
     PLOT_FILTER_V2_THIRD_ADJUSTMENT_HEIGHT: uint32
@@ -4584,7 +4578,6 @@ class ConsensusConstants:
         PLOT_FILTER_32_HEIGHT: uint32,
         MIN_PLOT_STRENGTH: uint8,
         MAX_PLOT_STRENGTH: uint8,
-        QUALITY_PROOF_SCAN_FILTER: uint8,
         PLOT_FILTER_V2_FIRST_ADJUSTMENT_HEIGHT: uint32,
         PLOT_FILTER_V2_SECOND_ADJUSTMENT_HEIGHT: uint32,
         PLOT_FILTER_V2_THIRD_ADJUSTMENT_HEIGHT: uint32
@@ -4656,7 +4649,6 @@ class ConsensusConstants:
         PLOT_FILTER_32_HEIGHT: Union[ uint32, _Unspec] = _Unspec(),
         MIN_PLOT_STRENGTH: Union[ uint8, _Unspec] = _Unspec(),
         MAX_PLOT_STRENGTH: Union[ uint8, _Unspec] = _Unspec(),
-        QUALITY_PROOF_SCAN_FILTER: Union[ uint8, _Unspec] = _Unspec(),
         PLOT_FILTER_V2_FIRST_ADJUSTMENT_HEIGHT: Union[ uint32, _Unspec] = _Unspec(),
         PLOT_FILTER_V2_SECOND_ADJUSTMENT_HEIGHT: Union[ uint32, _Unspec] = _Unspec(),
         PLOT_FILTER_V2_THIRD_ADJUSTMENT_HEIGHT: Union[ uint32, _Unspec] = _Unspec()) -> ConsensusConstants: ...
diff --git a/wheel/src/api.rs b/wheel/src/api.rs
@@ -627,23 +627,14 @@ impl Prover {
         Ok(Self(chia_pos2::Prover::new(Path::new(plot_path))?))
     }
 
-    pub fn get_qualities_for_challenge(
-        &self,
-        challenge: Bytes32,
-        proof_fragment_filter: u8,
-    ) -> PyResult<Vec<QualityProof>> {
-        let qualities = self
-            .0
-            .get_qualities_for_challenge(&challenge.to_bytes(), proof_fragment_filter)?;
-        Ok(qualities.into_iter().map(&QualityProof).collect())
-    }
-
-    pub fn get_partial_proof(&self, quality: &QualityProof) -> PyResult<(PartialProof, u8)> {
-        let chia_pos2::PartialProof {
-            proof_fragments,
-            strength,
-        } = self.0.get_partial_proof(&quality.0)?;
-        Ok((PartialProof { proof_fragments }, strength))
+    pub fn get_qualities_for_challenge(&self, challenge: Bytes32) -> PyResult<Vec<PartialProof>> {
+        let qualities = self.0.get_qualities_for_challenge(&challenge.to_bytes())?;
+        Ok(qualities
+            .into_iter()
+            .map(|q| PartialProof {
+                fragments: q.chain_links,
+            })
+            .collect())
     }
 
     pub fn size(&self) -> u8 {
@@ -684,51 +675,41 @@ impl Prover {
     }
 }
 
-#[pyclass]
-#[derive(Clone)]
-pub struct QualityProof(chia_pos2::QualityChain);
-
-#[pymethods]
-impl QualityProof {
-    pub fn serialize(&self) -> Bytes32 {
-        let mut sha256 = Sha256::new();
-        sha256.update(self.0.serialize());
-        sha256.finalize().into()
-    }
-}
-
 #[pyo3::pyfunction]
 pub fn validate_proof_v2(
     plot_id: Bytes32,
     size: u8,
     challenge: Bytes32,
-    required_plot_strength: u8,
-    proof_fragment_scan_filter: u8,
+    plot_strength: u8,
     proof: &[u8],
 ) -> Option<Bytes32> {
     chia_pos2::validate_proof_v2(
         &plot_id.to_bytes(),
         size,
         &challenge.to_bytes(),
-        required_plot_strength,
-        proof_fragment_scan_filter,
+        plot_strength,
         proof,
     )
     .map(|quality| -> Bytes32 {
         let mut sha256 = Sha256::new();
-        sha256.update(quality);
+        sha256.update(chia_pos2::serialize_quality(
+            &quality.chain_links,
+            plot_strength,
+        ));
         sha256.finalize().into()
     })
 }
 
 #[pyo3::pyfunction]
 pub fn solve_proof(fragments: &PartialProof, plot_id: Bytes32, strength: u8, k: u8) -> Vec<u8> {
-    let partial_proof = chia_pos2::PartialProof {
-        proof_fragments: fragments.proof_fragments,
+    chia_pos2::solve_proof(
+        &chia_pos2::QualityChain {
+            chain_links: fragments.fragments,
+        },
+        &plot_id.to_bytes(),
+        k,
         strength,
-    };
-
-    chia_pos2::solve_proof(&partial_proof, &plot_id.to_bytes(), k)
+    )
 }
 
 #[pymodule]
@@ -765,7 +746,6 @@ pub fn chia_rs(py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_function(wrap_pyfunction!(validate_proof_v2, m)?)?;
     m.add_function(wrap_pyfunction!(solve_proof, m)?)?;
     m.add_class::<Prover>()?;
-    m.add_class::<QualityProof>()?;
     m.add_class::<PartialProof>()?;
 
     // check time lock

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@ def test_formatting() -> None:`
`5`	`5`
`6`	`6`	`assert (`
`7`	`7`	`f"{DEFAULT_CONSTANTS}"`
`8`		- == "ConsensusConstants { SLOT_BLOCKS_TARGET: 32, MIN_BLOCKS_PER_CHALLENGE_BLOCK: 16, MAX_SUB_SLOT_BLOCKS: 128, NUM_SPS_SUB_SLOT: 64, SUB_SLOT_ITERS_STARTING: 134217728, DIFFICULTY_CONSTANT_FACTOR: 147573952589676412928, DIFFICULTY_STARTING: 7, DIFFICULTY_CHANGE_MAX_FACTOR: 3, SUB_EPOCH_BLOCKS: 384, EPOCH_BLOCKS: 4608, SIGNIFICANT_BITS: 8, DISCRIMINANT_SIZE_BITS: 1024, NUMBER_ZERO_BITS_PLOT_FILTER_V1: 9, NUMBER_ZERO_BITS_PLOT_FILTER_V2: 5, MIN_PLOT_SIZE_V1: 32, MAX_PLOT_SIZE_V1: 50, PLOT_SIZE_V2: 28, SUB_SLOT_TIME_TARGET: 600, NUM_SP_INTERVALS_EXTRA: 3, MAX_FUTURE_TIME2: 120, NUMBER_OF_TIMESTAMPS: 11, GENESIS_CHALLENGE: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855, AGG_SIG_ME_ADDITIONAL_DATA: ccd5bb71183532bff220ba46c268991a3ff07eb358e8255a65c30a2dce0e5fbb, AGG_SIG_PARENT_ADDITIONAL_DATA: baf5d69c647c91966170302d18521b0a85663433d161e72c826ed08677b53a74, AGG_SIG_PUZZLE_ADDITIONAL_DATA: 284fa2ef486c7a41cc29fc99c9d08376161e93dd37817edb8219f42dca7592c4, AGG_SIG_AMOUNT_ADDITIONAL_DATA: cda186a9cd030f7a130fae45005e81cae7a90e0fa205b75f6aebc0d598e0348e, AGG_SIG_PUZZLE_AMOUNT_ADDITIONAL_DATA: 0f7d90dff0613e6901e24dae59f1e690f18b8f5fbdcf1bb192ac9deaf7de22ad, AGG_SIG_PARENT_AMOUNT_ADDITIONAL_DATA: 585796bd90bb553c0430b87027ffee08d88aba0162c6e1abbbcc6b583f2ae7f9, AGG_SIG_PARENT_PUZZLE_ADDITIONAL_DATA: 2ebfdae17b29d83bae476a25ea06f0c4bd57298faddbbc3ec5ad29b9b86ce5df, GENESIS_PRE_FARM_POOL_PUZZLE_HASH: d23da14695a188ae5708dd152263c4db883eb27edeb936178d4d988b8f3ce5fc, GENESIS_PRE_FARM_FARMER_PUZZLE_HASH: 3d8765d3a597ec1d99663f6c9816d915b9f68613ac94009884c4addaefcce6af, MAX_VDF_WITNESS_SIZE: 64, MEMPOOL_BLOCK_BUFFER: 10, MAX_COIN_AMOUNT: 18446744073709551615, MAX_BLOCK_COST_CLVM: 11000000000, COST_PER_BYTE: 12000, WEIGHT_PROOF_THRESHOLD: 2, WEIGHT_PROOF_RECENT_BLOCKS: 1000, MAX_BLOCK_COUNT_PER_REQUESTS: 32, BLOCKS_CACHE_SIZE: 5120, MAX_GENERATOR_REF_LIST_SIZE: 512, POOL_SUB_SLOT_ITERS: 37600000000, HARD_FORK_HEIGHT: 5496000, HARD_FORK2_HEIGHT: 4294967295, PLOT_V1_PHASE_OUT_EPOCH_BITS: 8, PLOT_FILTER_128_HEIGHT: 10542000, PLOT_FILTER_64_HEIGHT: 15592000, PLOT_FILTER_32_HEIGHT: 20643000, MIN_PLOT_STRENGTH: 2, MAX_PLOT_STRENGTH: 32, QUALITY_PROOF_SCAN_FILTER: 5, PLOT_FILTER_V2_FIRST_ADJUSTMENT_HEIGHT: 4294967295, PLOT_FILTER_V2_SECOND_ADJUSTMENT_HEIGHT: 4294967295, PLOT_FILTER_V2_THIRD_ADJUSTMENT_HEIGHT: 4294967295, }"
	`8`	+ == "ConsensusConstants { SLOT_BLOCKS_TARGET: 32, MIN_BLOCKS_PER_CHALLENGE_BLOCK: 16, MAX_SUB_SLOT_BLOCKS: 128, NUM_SPS_SUB_SLOT: 64, SUB_SLOT_ITERS_STARTING: 134217728, DIFFICULTY_CONSTANT_FACTOR: 147573952589676412928, DIFFICULTY_STARTING: 7, DIFFICULTY_CHANGE_MAX_FACTOR: 3, SUB_EPOCH_BLOCKS: 384, EPOCH_BLOCKS: 4608, SIGNIFICANT_BITS: 8, DISCRIMINANT_SIZE_BITS: 1024, NUMBER_ZERO_BITS_PLOT_FILTER_V1: 9, NUMBER_ZERO_BITS_PLOT_FILTER_V2: 5, MIN_PLOT_SIZE_V1: 32, MAX_PLOT_SIZE_V1: 50, PLOT_SIZE_V2: 28, SUB_SLOT_TIME_TARGET: 600, NUM_SP_INTERVALS_EXTRA: 3, MAX_FUTURE_TIME2: 120, NUMBER_OF_TIMESTAMPS: 11, GENESIS_CHALLENGE: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855, AGG_SIG_ME_ADDITIONAL_DATA: ccd5bb71183532bff220ba46c268991a3ff07eb358e8255a65c30a2dce0e5fbb, AGG_SIG_PARENT_ADDITIONAL_DATA: baf5d69c647c91966170302d18521b0a85663433d161e72c826ed08677b53a74, AGG_SIG_PUZZLE_ADDITIONAL_DATA: 284fa2ef486c7a41cc29fc99c9d08376161e93dd37817edb8219f42dca7592c4, AGG_SIG_AMOUNT_ADDITIONAL_DATA: cda186a9cd030f7a130fae45005e81cae7a90e0fa205b75f6aebc0d598e0348e, AGG_SIG_PUZZLE_AMOUNT_ADDITIONAL_DATA: 0f7d90dff0613e6901e24dae59f1e690f18b8f5fbdcf1bb192ac9deaf7de22ad, AGG_SIG_PARENT_AMOUNT_ADDITIONAL_DATA: 585796bd90bb553c0430b87027ffee08d88aba0162c6e1abbbcc6b583f2ae7f9, AGG_SIG_PARENT_PUZZLE_ADDITIONAL_DATA: 2ebfdae17b29d83bae476a25ea06f0c4bd57298faddbbc3ec5ad29b9b86ce5df, GENESIS_PRE_FARM_POOL_PUZZLE_HASH: d23da14695a188ae5708dd152263c4db883eb27edeb936178d4d988b8f3ce5fc, GENESIS_PRE_FARM_FARMER_PUZZLE_HASH: 3d8765d3a597ec1d99663f6c9816d915b9f68613ac94009884c4addaefcce6af, MAX_VDF_WITNESS_SIZE: 64, MEMPOOL_BLOCK_BUFFER: 10, MAX_COIN_AMOUNT: 18446744073709551615, MAX_BLOCK_COST_CLVM: 11000000000, COST_PER_BYTE: 12000, WEIGHT_PROOF_THRESHOLD: 2, WEIGHT_PROOF_RECENT_BLOCKS: 1000, MAX_BLOCK_COUNT_PER_REQUESTS: 32, BLOCKS_CACHE_SIZE: 5120, MAX_GENERATOR_REF_LIST_SIZE: 512, POOL_SUB_SLOT_ITERS: 37600000000, HARD_FORK_HEIGHT: 5496000, HARD_FORK2_HEIGHT: 4294967295, PLOT_V1_PHASE_OUT_EPOCH_BITS: 8, PLOT_FILTER_128_HEIGHT: 10542000, PLOT_FILTER_64_HEIGHT: 15592000, PLOT_FILTER_32_HEIGHT: 20643000, MIN_PLOT_STRENGTH: 2, MAX_PLOT_STRENGTH: 32, PLOT_FILTER_V2_FIRST_ADJUSTMENT_HEIGHT: 4294967295, PLOT_FILTER_V2_SECOND_ADJUSTMENT_HEIGHT: 4294967295, PLOT_FILTER_V2_THIRD_ADJUSTMENT_HEIGHT: 4294967295, }"
`9`	`9`	`)`