Switch to #[classmethod] for SpendBundle::py_aggregate

crates/chia-bls/src/gtelement.rs

@@ -2,6 +2,10 @@ use blst::*;
 use chia_traits::chia_error::Result;
 use chia_traits::{read_bytes, Streamable};
 use clvmr::sha2::Sha256;
+#[cfg(feature = "py-bindings")]
+use pyo3::prelude::*;
+#[cfg(feature = "py-bindings")]
+use pyo3::types::PyType;
 use std::fmt;
 use std::hash::{Hash, Hasher};
 use std::io::Cursor;
@@ -112,6 +116,15 @@ impl GTElement {
         hex::encode(self.to_bytes())
     }
 
+    #[classmethod]
+    #[pyo3(name = "from_parent")]
+    pub fn from_parent(_cls: &Bound<'_, PyType>, instance: Self) -> PyResult<PyObject> {
+        Python::with_gil(|py| {
+            // ignore child case
+            Ok(instance.into_py(py))
+        })
+    }
+
     #[must_use]
     pub fn __mul__(&self, rhs: &Self) -> Self {
         let mut ret = self.clone();
@@ -130,7 +143,6 @@ mod pybindings {
 
     use crate::parse_hex::parse_hex_string;
     use chia_traits::{FromJsonDict, ToJsonDict};
-    use pyo3::prelude::*;
 
     impl ToJsonDict for GTElement {
         fn to_json_dict(&self, py: Python<'_>) -> PyResult<PyObject> {

crates/chia-bls/src/public_key.rs

@@ -4,6 +4,10 @@ use crate::{DerivableKey, Error, Result};
 use blst::*;
 use chia_traits::{read_bytes, Streamable};
 use clvmr::sha2::Sha256;
+#[cfg(feature = "py-bindings")]
+use pyo3::prelude::*;
+#[cfg(feature = "py-bindings")]
+use pyo3::types::PyType;
 use std::fmt;
 use std::hash::{Hash, Hasher};
 use std::io::Cursor;
@@ -321,6 +325,15 @@ impl PublicKey {
         other.pair(self)
     }
 
+    #[classmethod]
+    #[pyo3(name = "from_parent")]
+    pub fn from_parent(_cls: &Bound<'_, PyType>, instance: Self) -> PyResult<PyObject> {
+        Python::with_gil(|py| {
+            // ignore child case
+            Ok(instance.into_py(py))
+        })
+    }
+
     #[pyo3(name = "get_fingerprint")]
     pub fn py_get_fingerprint(&self) -> u32 {
         self.get_fingerprint()
@@ -353,7 +366,6 @@ mod pybindings {
     use crate::parse_hex::parse_hex_string;
 
     use chia_traits::{FromJsonDict, ToJsonDict};
-    use pyo3::prelude::*;
 
     impl ToJsonDict for PublicKey {
         fn to_json_dict(&self, py: Python<'_>) -> PyResult<PyObject> {
@@ -737,7 +749,11 @@ mod pytests {
             let pk = sk.public_key();
             Python::with_gil(|py| {
                 let string = pk.to_json_dict(py).expect("to_json_dict");
-                let pk2 = PublicKey::from_json_dict(string.bind(py)).unwrap();
+                let py_class = py.get_type_bound::<PublicKey>();
+                let pk2: PublicKey = PublicKey::from_json_dict(&py_class, string.bind(py))
+                    .unwrap()
+                    .extract(py)
+                    .unwrap();
                 assert_eq!(pk, pk2);
             });
         }
@@ -752,8 +768,9 @@ mod pytests {
     fn test_json_dict(#[case] input: &str, #[case] msg: &str) {
         pyo3::prepare_freethreaded_python();
         Python::with_gil(|py| {
-            let err =
-                PublicKey::from_json_dict(input.to_string().into_py(py).bind(py)).unwrap_err();
+            let py_class = py.get_type_bound::<PublicKey>();
+            let err = PublicKey::from_json_dict(&py_class, input.to_string().into_py(py).bind(py))
+                .unwrap_err();
             assert_eq!(err.value_bound(py).to_string(), msg.to_string());
         });
     }

crates/chia-bls/src/secret_key.rs

@@ -3,6 +3,10 @@ use blst::*;
 use chia_traits::{read_bytes, Streamable};
 use clvmr::sha2::Sha256;
 use hkdf::HkdfExtract;
+#[cfg(feature = "py-bindings")]
+use pyo3::prelude::*;
+#[cfg(feature = "py-bindings")]
+use pyo3::types::PyType;
 use std::fmt;
 use std::hash::{Hash, Hasher};
 use std::io::Cursor;
@@ -266,6 +270,15 @@ impl SecretKey {
         hex::encode(self.to_bytes())
     }
 
+    #[classmethod]
+    #[pyo3(name = "from_parent")]
+    pub fn from_parent(_cls: &Bound<'_, PyType>, instance: Self) -> PyResult<PyObject> {
+        Python::with_gil(|py| {
+            // ignore child case
+            Ok(instance.into_py(py))
+        })
+    }
+
     #[pyo3(name = "derive_hardened")]
     #[must_use]
     pub fn py_derive_hardened(&self, idx: u32) -> Self {
@@ -292,7 +305,6 @@ mod pybindings {
     use crate::parse_hex::parse_hex_string;
 
     use chia_traits::{FromJsonDict, ToJsonDict};
-    use pyo3::prelude::*;
 
     impl ToJsonDict for SecretKey {
         fn to_json_dict(&self, py: Python<'_>) -> PyResult<PyObject> {
@@ -557,7 +569,11 @@ mod pytests {
             let sk = SecretKey::from_seed(&data);
             Python::with_gil(|py| {
                 let string = sk.to_json_dict(py).expect("to_json_dict");
-                let sk2 = SecretKey::from_json_dict(string.bind(py)).unwrap();
+                let py_class = py.get_type_bound::<SecretKey>();
+                let sk2 = SecretKey::from_json_dict(&py_class, string.bind(py))
+                    .unwrap()
+                    .extract(py)
+                    .unwrap();
                 assert_eq!(sk, sk2);
                 assert_eq!(sk.public_key(), sk2.public_key());
             });
@@ -588,8 +604,9 @@ mod pytests {
     fn test_json_dict(#[case] input: &str, #[case] msg: &str) {
         pyo3::prepare_freethreaded_python();
         Python::with_gil(|py| {
-            let err =
-                SecretKey::from_json_dict(input.to_string().into_py(py).bind(py)).unwrap_err();
+            let py_class = py.get_type_bound::<SecretKey>();
+            let err = SecretKey::from_json_dict(&py_class, input.to_string().into_py(py).bind(py))
+                .unwrap_err();
             assert_eq!(err.value_bound(py).to_string(), msg.to_string());
         });
     }

crates/chia-bls/src/signature.rs

@@ -2,6 +2,10 @@ use crate::{Error, GTElement, PublicKey, Result, SecretKey};
 use blst::*;
 use chia_traits::{read_bytes, Streamable};
 use clvmr::sha2::Sha256;
+#[cfg(feature = "py-bindings")]
+use pyo3::prelude::*;
+#[cfg(feature = "py-bindings")]
+use pyo3::types::PyType;
 use std::borrow::Borrow;
 use std::fmt;
 use std::hash::{Hash, Hasher};
@@ -486,6 +490,15 @@ impl Signature {
         Self::default()
     }
 
+    #[classmethod]
+    #[pyo3(name = "from_parent")]
+    pub fn from_parent(_cls: &Bound<'_, PyType>, instance: Self) -> PyResult<PyObject> {
+        Python::with_gil(|py| {
+            // ignore child case
+            Ok(instance.into_py(py))
+        })
+    }
+
     #[pyo3(name = "pair")]
     pub fn py_pair(&self, other: &PublicKey) -> GTElement {
         self.pair(other)
@@ -518,7 +531,6 @@ mod pybindings {
     use crate::parse_hex::parse_hex_string;
 
     use chia_traits::{FromJsonDict, ToJsonDict};
-    use pyo3::prelude::*;
 
     impl ToJsonDict for Signature {
         fn to_json_dict(&self, py: Python<'_>) -> PyResult<PyObject> {
@@ -1259,7 +1271,11 @@ mod pytests {
             let sig = sign(&sk, msg);
             Python::with_gil(|py| {
                 let string = sig.to_json_dict(py).expect("to_json_dict");
-                let sig2 = Signature::from_json_dict(string.bind(py)).unwrap();
+                let py_class = py.get_type_bound::<Signature>();
+                let sig2 = Signature::from_json_dict(&py_class, string.bind(py))
+                    .unwrap()
+                    .extract(py)
+                    .unwrap();
                 assert_eq!(sig, sig2);
             });
         }
@@ -1274,8 +1290,9 @@ mod pytests {
     fn test_json_dict(#[case] input: &str, #[case] msg: &str) {
         pyo3::prepare_freethreaded_python();
         Python::with_gil(|py| {
-            let err =
-                Signature::from_json_dict(input.to_string().into_py(py).bind(py)).unwrap_err();
+            let py_class = py.get_type_bound::<Signature>();
+            let err = Signature::from_json_dict(&py_class, input.to_string().into_py(py).bind(py))
+                .unwrap_err();
             assert_eq!(err.value_bound(py).to_string(), msg.to_string());
         });
     }

crates/chia-consensus/src/gen/owned_conditions.rs

@@ -8,6 +8,11 @@ use super::conditions::{SpendBundleConditions, SpendConditions};
 #[cfg(feature = "py-bindings")]
 use chia_py_streamable_macro::{PyJsonDict, PyStreamable};
 
+#[cfg(feature = "py-bindings")]
+use pyo3::prelude::*;
+#[cfg(feature = "py-bindings")]
+use pyo3::types::PyType;
+
 #[derive(Streamable, Hash, Debug, Clone, Eq, PartialEq)]
 #[cfg_attr(
     feature = "py-bindings",
@@ -144,3 +149,29 @@ fn convert_agg_sigs(a: &Allocator, agg_sigs: &[(PublicKey, NodePtr)]) -> Vec<(Pu
     }
     ret
 }
+
+#[cfg(feature = "py-bindings")]
+#[pymethods]
+impl OwnedSpendConditions {
+    #[classmethod]
+    #[pyo3(name = "from_parent")]
+    pub fn from_parent(_cls: &Bound<'_, PyType>, instance: Self) -> PyResult<PyObject> {
+        Python::with_gil(|py| {
+            // ignore child case - though this could be extended in the future to support child class
+            Ok(instance.into_py(py))
+        })
+    }
+}
+
+#[cfg(feature = "py-bindings")]
+#[pymethods]
+impl OwnedSpendBundleConditions {
+    #[classmethod]
+    #[pyo3(name = "from_parent")]
+    pub fn from_parent(_cls: &Bound<'_, PyType>, instance: Self) -> PyResult<PyObject> {
+        Python::with_gil(|py| {
+            // ignore child case - though this could be extended in the future to support child class
+            Ok(instance.into_py(py))
+        })
+    }
+}

crates/chia-protocol/src/coin.rs

@@ -8,6 +8,8 @@ use clvmr::sha2::Sha256;
 
 #[cfg(feature = "py-bindings")]
 use pyo3::prelude::*;
+#[cfg(feature = "py-bindings")]
+use pyo3::types::PyType;
 
 #[streamable]
 #[derive(Copy)]
@@ -55,6 +57,21 @@ impl Coin {
     }
 }
 
+#[cfg(feature = "py-bindings")]
+#[pymethods]
+impl Coin {
+    #[classmethod]
+    #[pyo3(name = "from_parent")]
+    pub fn from_parent(cls: &Bound<'_, PyType>, coin: Self) -> PyResult<PyObject> {
+        Python::with_gil(|py| {
+            // Convert result into potential child class
+            let instance = cls.call1((coin.parent_coin_info, coin.puzzle_hash, coin.amount))?;
+
+            Ok(instance.into_py(py))
+        })
+    }
+}
+
 impl<N, E: ClvmEncoder<Node = N>> ToClvm<E> for Coin {
     fn to_clvm(&self, encoder: &mut E) -> Result<N, ToClvmError> {
         clvm_list!(self.parent_coin_info, self.puzzle_hash, self.amount).to_clvm(encoder)

crates/chia-protocol/src/coin_spend.rs

@@ -2,10 +2,29 @@ use chia_streamable_macro::streamable;
 
 use crate::coin::Coin;
 use crate::program::Program;
+#[cfg(feature = "py-bindings")]
+use pyo3::prelude::*;
+#[cfg(feature = "py-bindings")]
+use pyo3::types::PyType;
 
 #[streamable]
 pub struct CoinSpend {
     coin: Coin,
     puzzle_reveal: Program,
     solution: Program,
 }
+
+#[cfg(feature = "py-bindings")]
+#[pymethods]
+impl CoinSpend {
+    #[classmethod]
+    #[pyo3(name = "from_parent")]
+    pub fn from_parent(cls: &Bound<'_, PyType>, cs: Self) -> PyResult<PyObject> {
+        Python::with_gil(|py| {
+            // Convert result into potential child class
+            let instance = cls.call1((cs.coin, cs.puzzle_reveal, cs.solution))?;
+
+            Ok(instance.into_py(py))
+        })
+    }
+}

crates/chia-protocol/src/program.rs

@@ -12,6 +12,10 @@ use clvmr::serde::{
 };
 use clvmr::sha2::Sha256;
 use clvmr::{Allocator, ChiaDialect};
+#[cfg(feature = "py-bindings")]
+use pyo3::prelude::*;
+#[cfg(feature = "py-bindings")]
+use pyo3::types::PyType;
 use std::io::Cursor;
 use std::ops::Deref;
 
@@ -152,9 +156,6 @@ use chia_traits::{FromJsonDict, ToJsonDict};
 #[cfg(feature = "py-bindings")]
 use chia_py_streamable_macro::PyStreamable;
 
-#[cfg(feature = "py-bindings")]
-use pyo3::prelude::*;
-
 #[cfg(feature = "py-bindings")]
 use pyo3::types::{PyList, PyTuple};
 
@@ -486,6 +487,19 @@ impl ToJsonDict for Program {
     }
 }
 
+#[cfg(feature = "py-bindings")]
+#[pymethods]
+impl Program {
+    #[classmethod]
+    #[pyo3(name = "from_parent")]
+    pub fn from_parent(_cls: &Bound<'_, PyType>, instance: Self) -> PyResult<PyObject> {
+        Python::with_gil(|py| {
+            // ignore child case
+            Ok(instance.into_py(py))
+        })
+    }
+}
+
 #[cfg(feature = "py-bindings")]
 impl FromJsonDict for Program {
     fn from_json_dict(o: &Bound<'_, PyAny>) -> PyResult<Self> {