Remove chia-blockchain dependency for most of chia_rs

crates/chia-protocol/src/block_record.rs

@@ -1,6 +1,9 @@
-use chia_streamable_macro::streamable;
-
+#[cfg(feature = "py-bindings")]
+use crate::pot_iterations::{calculate_ip_iters, calculate_sp_iters};
 use crate::{Bytes32, ClassgroupElement, Coin, SubEpochSummary};
+use chia_streamable_macro::streamable;
+#[cfg(feature = "py-bindings")]
+use pyo3::exceptions::PyValueError;
 
 #[cfg(feature = "py-bindings")]
 use pyo3::prelude::*;
@@ -67,13 +70,48 @@ impl BlockRecord {
     pub fn is_challenge_block(&self, min_blocks_per_challenge_block: u8) -> bool {
         self.deficit == min_blocks_per_challenge_block - 1
     }
-}
-
-#[cfg(feature = "py-bindings")]
-use pyo3::types::PyDict;
 
-#[cfg(feature = "py-bindings")]
-use pyo3::exceptions::PyValueError;
+    // fn calculate_sp_interval_iters(&self, num_sps_sub_slot: u64) -> PyResult<u64> {
+    //     if self.sub_slot_iters % num_sps_sub_slot != 0 {
+    //         return Err(PyValueError::new_err(
+    //             "sub_slot_iters % constants.NUM_SPS_SUB_SLOT != 0",
+    //         ));
+    //     }
+    //     Ok(self.sub_slot_iters / num_sps_sub_slot)
+    // }
+
+    // fn calculate_sp_iters(&self, num_sps_sub_slot: u32) -> PyResult<u64> {
+    //     if self.signage_point_index as u32 >= num_sps_sub_slot {
+    //         return Err(PyValueError::new_err("SP index too high"));
+    //     }
+    //     Ok(self.calculate_sp_interval_iters(num_sps_sub_slot as u64)?
+    //         * self.signage_point_index as u64)
+    // }
+
+    // fn calculate_ip_iters(
+    //     &self,
+    //     num_sps_sub_slot: u32,
+    //     num_sp_intervals_extra: u8,
+    // ) -> PyResult<u64> {
+    //     let sp_iters = self.calculate_sp_iters(num_sps_sub_slot)?;
+    //     let sp_interval_iters = self.calculate_sp_interval_iters(num_sps_sub_slot as u64)?;
+    //     if sp_iters % sp_interval_iters != 0 || sp_iters >= self.sub_slot_iters {
+    //         return Err(PyValueError::new_err(format!(
+    //             "Invalid sp iters {sp_iters} for this ssi {}",
+    //             self.sub_slot_iters
+    //         )));
+    //     } else if self.required_iters >= sp_interval_iters || self.required_iters == 0 {
+    //         return Err(PyValueError::new_err(format!(
+    //             "Required iters {} is not below the sp interval iters {} {} or not >=0",
+    //             self.required_iters, sp_interval_iters, self.sub_slot_iters
+    //         )));
+    //     }
+    //     Ok(
+    //         (sp_iters + num_sp_intervals_extra as u64 * sp_interval_iters + self.required_iters)
+    //             % self.sub_slot_iters,
+    //     )
+    // }
+}
 
 #[cfg(feature = "py-bindings")]
 use chia_traits::ChiaToPython;
@@ -102,16 +140,11 @@ impl BlockRecord {
         ))
     }
 
-    // TODO: at some point it would be nice to port
-    // chia.consensus.pot_iterations to rust, and make this less hacky
-    fn sp_sub_slot_total_iters_impl(
-        &self,
-        py: Python<'_>,
-        constants: &Bound<'_, PyAny>,
-    ) -> PyResult<u128> {
+    // TODO: these could be implemented as a total port of pot iterations
+    fn sp_sub_slot_total_iters_impl(&self, constants: &Bound<'_, PyAny>) -> PyResult<u128> {
         let ret = self
             .total_iters
-            .checked_sub(self.ip_iters_impl(py, constants)? as u128)
+            .checked_sub(self.ip_iters_impl(constants)? as u128)
             .ok_or(PyValueError::new_err("uint128 overflow"))?;
         if self.overflow {
             ret.checked_sub(self.sub_slot_iters as u128)
@@ -121,48 +154,38 @@ impl BlockRecord {
         }
     }
 
-    fn ip_sub_slot_total_iters_impl(
-        &self,
-        py: Python<'_>,
-        constants: &Bound<'_, PyAny>,
-    ) -> PyResult<u128> {
+    fn ip_sub_slot_total_iters_impl(&self, constants: &Bound<'_, PyAny>) -> PyResult<u128> {
         self.total_iters
-            .checked_sub(self.ip_iters_impl(py, constants)? as u128)
+            .checked_sub(self.ip_iters_impl(constants)? as u128)
             .ok_or(PyValueError::new_err("uint128 overflow"))
     }
 
-    fn sp_iters_impl(&self, py: Python<'_>, constants: &Bound<'_, PyAny>) -> PyResult<u64> {
-        let ctx = PyDict::new(py);
-        ctx.set_item("sub_slot_iters", self.sub_slot_iters)?;
-        ctx.set_item("signage_point_index", self.signage_point_index)?;
-        ctx.set_item("constants", constants)?;
-        py.run(
-            c"from chia.consensus.pot_iterations import calculate_ip_iters, calculate_sp_iters\n\
-            ret = calculate_sp_iters(constants, sub_slot_iters, signage_point_index)\n",
-            None,
-            Some(&ctx),
-        )?;
-        ctx.get_item("ret").unwrap().unwrap().extract::<u64>()
-    }
-
-    fn ip_iters_impl(&self, py: Python<'_>, constants: &Bound<'_, PyAny>) -> PyResult<u64> {
-        let ctx = PyDict::new(py);
-        ctx.set_item("sub_slot_iters", self.sub_slot_iters)?;
-        ctx.set_item("signage_point_index", self.signage_point_index)?;
-        ctx.set_item("required_iters", self.required_iters)?;
-        ctx.set_item("constants", constants)?;
-        py.run(
-            c"from chia.consensus.pot_iterations import calculate_ip_iters, calculate_sp_iters\n\
-            ret = calculate_ip_iters(constants, sub_slot_iters, signage_point_index, required_iters)\n",
-            None,
-            Some(&ctx),
-            )?;
-        ctx.get_item("ret").unwrap().unwrap().extract::<u64>()
-    }
-
-    fn sp_total_iters_impl(&self, py: Python<'_>, constants: &Bound<'_, PyAny>) -> PyResult<u128> {
-        self.sp_sub_slot_total_iters_impl(py, constants)?
-            .checked_add(self.sp_iters_impl(py, constants)? as u128)
+    fn sp_iters_impl(&self, constants: &Bound<'_, PyAny>) -> PyResult<u64> {
+        let num_sps_sub_slot = constants.getattr("NUM_SPS_SUB_SLOT")?.extract::<u32>()?;
+        calculate_sp_iters(
+            num_sps_sub_slot,
+            self.sub_slot_iters,
+            self.signage_point_index,
+        )
+    }
+
+    fn ip_iters_impl(&self, constants: &Bound<'_, PyAny>) -> PyResult<u64> {
+        let num_sps_sub_slot = constants.getattr("NUM_SPS_SUB_SLOT")?.extract::<u32>()?;
+        let num_sp_intervals_extra = constants
+            .getattr("NUM_SP_INTERVALS_EXTRA")?
+            .extract::<u8>()?;
+        calculate_ip_iters(
+            num_sps_sub_slot,
+            num_sp_intervals_extra,
+            self.sub_slot_iters,
+            self.signage_point_index,
+            self.required_iters,
+        )
+    }
+
+    fn sp_total_iters_impl(&self, constants: &Bound<'_, PyAny>) -> PyResult<u128> {
+        self.sp_sub_slot_total_iters_impl(constants)?
+            .checked_add(self.sp_iters_impl(constants)? as u128)
             .ok_or(PyValueError::new_err("uint128 overflow"))
     }
 
@@ -171,38 +194,38 @@ impl BlockRecord {
         py: Python<'a>,
         constants: &Bound<'_, PyAny>,
     ) -> PyResult<Bound<'a, PyAny>> {
-        ChiaToPython::to_python(&self.sp_sub_slot_total_iters_impl(py, constants)?, py)
+        ChiaToPython::to_python(&self.sp_sub_slot_total_iters_impl(constants)?, py)
     }
 
     fn ip_sub_slot_total_iters<'a>(
         &self,
         py: Python<'a>,
         constants: &Bound<'_, PyAny>,
     ) -> PyResult<Bound<'a, PyAny>> {
-        ChiaToPython::to_python(&self.ip_sub_slot_total_iters_impl(py, constants)?, py)
+        ChiaToPython::to_python(&self.ip_sub_slot_total_iters_impl(constants)?, py)
     }
 
     fn sp_iters<'a>(
         &self,
         py: Python<'a>,
         constants: &Bound<'_, PyAny>,
     ) -> PyResult<Bound<'a, PyAny>> {
-        ChiaToPython::to_python(&self.sp_iters_impl(py, constants)?, py)
+        ChiaToPython::to_python(&self.sp_iters_impl(constants)?, py)
     }
 
     fn ip_iters<'a>(
         &self,
         py: Python<'a>,
         constants: &Bound<'_, PyAny>,
     ) -> PyResult<Bound<'a, PyAny>> {
-        ChiaToPython::to_python(&self.ip_iters_impl(py, constants)?, py)
+        ChiaToPython::to_python(&self.ip_iters_impl(constants)?, py)
     }
 
     fn sp_total_iters<'a>(
         &self,
         py: Python<'a>,
         constants: &Bound<'_, PyAny>,
     ) -> PyResult<Bound<'a, PyAny>> {
-        ChiaToPython::to_python(&self.sp_total_iters_impl(py, constants)?, py)
+        ChiaToPython::to_python(&self.sp_total_iters_impl(constants)?, py)
     }
 }

crates/chia-protocol/src/lib.rs

@@ -13,6 +13,10 @@ mod fullblock;
 mod header_block;
 mod peer_info;
 mod pool_target;
+#[cfg(feature = "py-bindings")]
+mod pos_quality;
+#[cfg(feature = "py-bindings")]
+mod pot_iterations;
 mod program;
 mod proof_of_space;
 mod reward_chain_block;
@@ -44,6 +48,10 @@ pub use crate::fullblock::*;
 pub use crate::header_block::*;
 pub use crate::peer_info::*;
 pub use crate::pool_target::*;
+#[cfg(feature = "py-bindings")]
+pub use crate::pos_quality::*;
+#[cfg(feature = "py-bindings")]
+pub use crate::pot_iterations::*;
 pub use crate::program::*;
 pub use crate::proof_of_space::*;
 pub use crate::reward_chain_block::*;

crates/chia-protocol/src/pos_quality.rs

@@ -0,0 +1,19 @@
+// The actual space in bytes of a plot, is _expected_plot_size(k) * UI_ACTUAL_SPACE_CONSTANT_FACTO
+// This is not used in consensus, only for display purposes
+
+pub const UI_ACTUAL_SPACE_CONSTANT_FACTOR: f32 = 0.78;
+
+// TODO: Update this when new plot format releases
+#[cfg(feature = "py-bindings")]
+#[pyo3::pyfunction]
+pub fn expected_plot_size(k: u32) -> pyo3::PyResult<u64> {
+    // """
+    // Given the plot size parameter k (which is between 32 and 59), computes the
+    // expected size of the plot in bytes (times a constant factor). This is based on efficient encoding
+    // of the plot, and aims to be scale agnostic, so larger plots don't
+    // necessarily get more rewards per byte. The +1 is added to give half a bit more space per entry, which
+    // is necessary to store the entries in the plot.
+    // """
+
+    Ok((2 * k as u64 + 1) * (1_u64 << (k - 1)))
+}