Revert "Merge pull request #846 from Chia-Network/catchup/long_lived_…

…initial_datalayer_from_main_ea4928bcf6973a7e68f97a73e058b2634bd5d804"

This reverts commit 4362b8c, reversing
changes made to 8733662.

Cargo.toml

@@ -129,16 +129,16 @@ clvm-traits-fuzz = { path = "./crates/clvm-traits/fuzz", version = "0.16.0" }
 clvm-utils-fuzz = { path = "./crates/clvm-utils/fuzz", version = "0.16.0" }
 blst = { version = "0.3.12", features = ["portable"] }
 clvmr = "0.10.0"
-syn = "2.0.95"
+syn = "2.0.90"
 quote = "1.0.32"
 proc-macro2 = "1.0.92"
 proc-macro-crate = "1.3.1"
-anyhow = "1.0.95"
+anyhow = "1.0.94"
 sha2 = "0.10.8"
 hkdf = "0.12.0"
 hex = "0.4.3"
 thiserror = "1.0.69"
-pyo3 = "0.23.3"
+pyo3 = "0.22.6"
 arbitrary = "1.4.1"
 rand = "0.8.5"
 criterion = "0.5.1"
@@ -153,11 +153,11 @@ num-traits = "0.2.15"
 num-bigint = "0.4.5"
 text-diff = "0.4.0"
 lazy_static = "1.4.0"
-rcgen = "0.13.2"
+rcgen = "0.13.1"
 rsa = "0.9.7"
 time = "0.3.22"
 rusqlite = "0.31.0"
-clap = "4.5.23"
+clap = "4.5.22"
 zstd = "0.13.2"
 blocking-threadpool = "1.0.1"
 libfuzzer-sys = "0.4"

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2025 Chia Network Inc.
+   Copyright 2024 Chia Network Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

crates/chia-bls/fuzz/fuzz_targets/blspy-fidelity.rs

@@ -35,15 +35,15 @@ fuzz_target!(|data: &[u8]| {
         print(sys.executable)
         "#, None, None).unwrap();
         */
-        let blspy = py.import("blspy").unwrap();
+        let blspy = py.import_bound("blspy").unwrap();
         let aug = blspy.getattr("AugSchemeMPL").unwrap();
 
         // Generate key pair from seed
         let rust_sk = SecretKey::from_seed(data);
         let py_sk = aug
             .call_method1(
                 "key_gen",
-                PyTuple::new(py, [PyBytes::new(py, data)]).unwrap(),
+                PyTuple::new_bound(py, [PyBytes::new_bound(py, data)]),
             )
             .unwrap();
 
@@ -66,14 +66,10 @@ fuzz_target!(|data: &[u8]| {
         let py_sk1 = aug
             .call_method1(
                 "derive_child_sk_unhardened",
-                PyTuple::new(
+                PyTuple::new_bound(
                     py,
-                    [
-                        py_sk.clone(),
-                        idx.into_pyobject(py).unwrap().clone().into_any(),
-                    ],
-                )
-                .unwrap(),
+                    [py_sk.clone(), idx.to_object(py).bind(py).clone().into_any()],
+                ),
             )
             .unwrap();
         assert_eq!(to_bytes(&py_sk1), rust_sk1.to_bytes());
@@ -82,11 +78,7 @@ fuzz_target!(|data: &[u8]| {
         let py_pk1 = aug
             .call_method1(
                 "derive_child_pk_unhardened",
-                PyTuple::new(
-                    py,
-                    [py_pk, idx.into_pyobject(py).unwrap().clone().into_any()],
-                )
-                .unwrap(),
+                PyTuple::new_bound(py, [py_pk, idx.to_object(py).bind(py).clone().into_any()]),
             )
             .unwrap();
         assert_eq!(to_bytes(&py_pk1), rust_pk1.to_bytes());
@@ -96,7 +88,7 @@ fuzz_target!(|data: &[u8]| {
         let py_sig1 = aug
             .call_method1(
                 "sign",
-                PyTuple::new(py, [py_sk1, PyBytes::new(py, data).into_any()]).unwrap(),
+                PyTuple::new_bound(py, [py_sk1, PyBytes::new_bound(py, data).into_any()]),
             )
             .unwrap();
         assert_eq!(to_bytes(&py_sig1), rust_sig1.to_bytes());
@@ -107,11 +99,7 @@ fuzz_target!(|data: &[u8]| {
         let py_sk2 = aug
             .call_method1(
                 "derive_child_sk",
-                PyTuple::new(
-                    py,
-                    [py_sk, idx.into_pyobject(py).unwrap().clone().into_any()],
-                )
-                .unwrap(),
+                PyTuple::new_bound(py, [py_sk, idx.to_object(py).bind(py).clone().into_any()]),
             )
             .unwrap();
         assert_eq!(to_bytes(&py_sk2), rust_sk2.to_bytes());
@@ -121,7 +109,7 @@ fuzz_target!(|data: &[u8]| {
         let py_sig2 = aug
             .call_method1(
                 "sign",
-                PyTuple::new(py, [py_sk2, PyBytes::new(py, data).into_any()]).unwrap(),
+                PyTuple::new_bound(py, [py_sk2, PyBytes::new_bound(py, data).into_any()]),
             )
             .unwrap();
         assert_eq!(to_bytes(&py_sig2), rust_sig2.to_bytes());
@@ -131,7 +119,7 @@ fuzz_target!(|data: &[u8]| {
         let py_agg = aug
             .call_method1(
                 "aggregate",
-                PyTuple::new(py, [PyList::new(py, [py_sig1, py_sig2]).unwrap()]).unwrap(),
+                PyTuple::new_bound(py, [PyList::new_bound(py, [py_sig1, py_sig2])]),
             )
             .unwrap();
         assert_eq!(to_bytes(&py_agg), rust_agg.to_bytes());

crates/chia-bls/src/bls_cache.rs

@@ -163,12 +163,12 @@ impl BlsCache {
         sig: &Signature,
     ) -> PyResult<bool> {
         let pks = pks
-            .try_iter()?
+            .iter()?
             .map(|item| item?.extract())
             .collect::<PyResult<Vec<PublicKey>>>()?;
 
         let msgs = msgs
-            .try_iter()?
+            .iter()?
             .map(|item| item?.extract())
             .collect::<PyResult<Vec<PyBackedBytes>>>()?;
 
@@ -184,21 +184,18 @@ impl BlsCache {
     pub fn py_items(&self, py: pyo3::Python<'_>) -> PyResult<PyObject> {
         use pyo3::prelude::*;
         use pyo3::types::PyBytes;
-        let ret = PyList::empty(py);
+        let ret = PyList::empty_bound(py);
         let c = self.cache.lock().expect("cache");
         for (key, value) in &c.items {
-            ret.append((
-                PyBytes::new(py, key),
-                value.clone().into_pyobject(py)?.into_any(),
-            ))?;
+            ret.append((PyBytes::new_bound(py, key), value.clone().into_py(py)))?;
         }
         Ok(ret.into())
     }
 
     #[pyo3(name = "update")]
     pub fn py_update(&self, other: &Bound<'_, PySequence>) -> PyResult<()> {
         let mut c = self.cache.lock().expect("cache");
-        for item in other.borrow().try_iter()? {
+        for item in other.borrow().iter()? {
             let (key, value): (Vec<u8>, GTElement) = item?.extract()?;
             c.put(
                 key.try_into()
@@ -212,11 +209,11 @@ impl BlsCache {
     #[pyo3(name = "evict")]
     pub fn py_evict(&self, pks: &Bound<'_, PyList>, msgs: &Bound<'_, PyList>) -> PyResult<()> {
         let pks = pks
-            .try_iter()?
+            .iter()?
             .map(|item| item?.extract())
             .collect::<PyResult<Vec<PublicKey>>>()?;
         let msgs = msgs
-            .try_iter()?
+            .iter()?
             .map(|item| item?.extract())
             .collect::<PyResult<Vec<PyBackedBytes>>>()?;
         self.evict(pks.into_iter().zip(msgs));

crates/chia-bls/src/gtelement.rs

@@ -148,10 +148,7 @@ mod pybindings {
     impl ToJsonDict for GTElement {
         fn to_json_dict(&self, py: Python<'_>) -> PyResult<PyObject> {
             let bytes = self.to_bytes();
-            Ok(("0x".to_string() + &hex::encode(bytes))
-                .into_pyobject(py)?
-                .into_any()
-                .unbind())
+            Ok(("0x".to_string() + &hex::encode(bytes)).into_py(py))
         }
     }
 

crates/chia-bls/src/public_key.rs

@@ -371,10 +371,7 @@ mod pybindings {
     impl ToJsonDict for PublicKey {
         fn to_json_dict(&self, py: Python<'_>) -> PyResult<PyObject> {
             let bytes = self.to_bytes();
-            Ok(("0x".to_string() + &hex::encode(bytes))
-                .into_pyobject(py)?
-                .into_any()
-                .unbind())
+            Ok(("0x".to_string() + &hex::encode(bytes)).into_py(py))
         }
     }
 
@@ -737,7 +734,7 @@ mod tests {
 mod pytests {
     use super::*;
     use crate::SecretKey;
-    use pyo3::Python;
+    use pyo3::{IntoPy, Python};
     use rand::rngs::StdRng;
     use rand::{Rng, SeedableRng};
     use rstest::rstest;
@@ -753,7 +750,7 @@ mod pytests {
             let pk = sk.public_key();
             Python::with_gil(|py| {
                 let string = pk.to_json_dict(py).expect("to_json_dict");
-                let py_class = py.get_type::<PublicKey>();
+                let py_class = py.get_type_bound::<PublicKey>();
                 let pk2: PublicKey = PublicKey::from_json_dict(&py_class, py, string.bind(py))
                     .unwrap()
                     .extract(py)
@@ -772,14 +769,11 @@ mod pytests {
     fn test_json_dict(#[case] input: &str, #[case] msg: &str) {
         pyo3::prepare_freethreaded_python();
         Python::with_gil(|py| {
-            let py_class = py.get_type::<PublicKey>();
-            let err = PublicKey::from_json_dict(
-                &py_class,
-                py,
-                &input.to_string().into_pyobject(py).unwrap().into_any(),
-            )
-            .unwrap_err();
-            assert_eq!(err.value(py).to_string(), msg.to_string());
+            let py_class = py.get_type_bound::<PublicKey>();
+            let err =
+                PublicKey::from_json_dict(&py_class, py, input.to_string().into_py(py).bind(py))
+                    .unwrap_err();
+            assert_eq!(err.value_bound(py).to_string(), msg.to_string());
         });
     }
 }