SpendBundle only

Chia-Network · Aug 7, 2024 · c208121 · c208121
1 parent d262408
commit c208121
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/crates/chia-bls/src/secret_key.rs b/crates/chia-bls/src/secret_key.rs
@@ -11,7 +11,7 @@ use std::ops::{Add, AddAssign};
 
 #[cfg_attr(
     feature = "py-bindings",
-    pyo3::pyclass(frozen, subclass, name = "PrivateKey"),
+    pyo3::pyclass(frozen, name = "PrivateKey"),
     derive(chia_py_streamable_macro::PyStreamable)
 )]
 #[derive(PartialEq, Eq, Clone)]

diff --git a/crates/chia-consensus/src/gen/owned_conditions.rs b/crates/chia-consensus/src/gen/owned_conditions.rs
@@ -11,7 +11,7 @@ use chia_py_streamable_macro::{PyJsonDict, PyStreamable};
 #[derive(Streamable, Hash, Debug, Clone, Eq, PartialEq)]
 #[cfg_attr(
     feature = "py-bindings",
-    pyo3::pyclass(name = "Spend", get_all, frozen, subclass),
+    pyo3::pyclass(name = "Spend", get_all, frozen),
     derive(PyJsonDict, PyStreamable)
 )]
 pub struct OwnedSpend {
@@ -39,7 +39,7 @@ pub struct OwnedSpend {
 #[derive(Streamable, Hash, Debug, Clone, Eq, PartialEq)]
 #[cfg_attr(
     feature = "py-bindings",
-    pyo3::pyclass(name = "SpendBundleConditions", get_all, frozen, subclass),
+    pyo3::pyclass(name = "SpendBundleConditions", get_all, frozen),
     derive(PyJsonDict, PyStreamable)
 )]
 pub struct OwnedSpendBundleConditions {

diff --git a/crates/chia-consensus/src/merkle_tree.rs b/crates/chia-consensus/src/merkle_tree.rs
@@ -31,7 +31,7 @@ pub enum ArrayTypes {
 
 // represents a MerkleSet by putting all the nodes in a vec. Root is the last entry.
 #[derive(PartialEq, Debug, Clone, Default)]
-#[cfg_attr(feature = "py-bindings", pyclass(frozen, subclass, name = "MerkleSet"))]
+#[cfg_attr(feature = "py-bindings", pyclass(frozen, name = "MerkleSet"))]
 pub struct MerkleSet {
     nodes_vec: Vec<(ArrayTypes, [u8; 32])>,
     // This is true if the tree was built from a proof. This means the tree may

diff --git a/crates/chia-protocol/src/spend_bundle.rs b/crates/chia-protocol/src/spend_bundle.rs
@@ -15,7 +15,7 @@ use clvmr::ENABLE_FIXED_DIV;
 #[cfg(feature = "py-bindings")]
 use pyo3::prelude::*;
 
-#[streamable]
+#[streamable(subclass)]
 pub struct SpendBundle {
     coin_spends: Vec<CoinSpend>,
     aggregated_signature: G2Element,

diff --git a/crates/chia_streamable_macro/src/lib.rs b/crates/chia_streamable_macro/src/lib.rs
@@ -24,6 +24,7 @@ pub fn streamable(attr: TokenStream, item: TokenStream) -> TokenStream {
     };
 
     let is_message = &attr.to_string() == "message";
+    let is_subclass = &attr.to_string() == "subclass";
 
     let mut input: DeriveInput = parse_macro_input!(item);
     let name = input.ident.clone();
@@ -92,13 +93,19 @@ pub fn streamable(attr: TokenStream, item: TokenStream) -> TokenStream {
         #[derive(chia_streamable_macro::Streamable, Hash, Debug, Clone, Eq, PartialEq)]
     };
 
+    let class_attrs = if is_subclass {
+        quote!(frozen, subclass)
+    } else {
+        quote!(frozen)
+    };
+
     // If you're calling the macro from `chia-protocol`, enable Python bindings and arbitrary conditionally.
     // Otherwise, you're calling it from an external crate which doesn't have this infrastructure setup.
     // In that case, the caller can add these macros manually if they want to.
     let attrs = if matches!(found_crate, FoundCrate::Itself) {
         quote! {
             #[cfg_attr(
-                feature = "py-bindings", pyo3::pyclass(frozen, subclass), derive(
+                feature = "py-bindings", pyo3::pyclass(#class_attrs), derive(
                     chia_py_streamable_macro::PyJsonDict,
                     chia_py_streamable_macro::PyStreamable,
                     chia_py_streamable_macro::PyGetters