Merge pull request #169 from Chia-Network/bump-clvm-0.2.5

bump clvm_rs dependency to 0.2.5

Cargo.toml

@@ -18,7 +18,7 @@ repository = "https://github.com/Chia-Network/chia_rs/"
 py-bindings = ["dep:pyo3"]
 
 [dependencies]
-clvmr = "=0.2.4"
+clvmr = "=0.2.5"
 hex = "=0.4.3"
 pyo3 = { version = "=0.15.1", features = ["extension-module"], optional = true }
 clvm-utils = { version = "=0.2.7", path = "clvm-utils" }

chia-protocol/Cargo.toml

@@ -13,11 +13,11 @@ py-bindings = ["dep:pyo3", "dep:chia_py_streamable_macro"]
 
 [dependencies]
 pyo3 = { version = "=0.15.1", features = ["extension-module", "multiple-pymethods"], optional = true }
-sha2 = "=0.10.2"
+sha2 = "=0.9.9"
 hex = "=0.4.3"
 chia_streamable_macro = { version = "=0.2.4", path = "../chia_streamable_macro" }
 chia_py_streamable_macro = { path = "../chia_py_streamable_macro", version = "=0.1.3", optional = true }
-clvmr = "=0.2.4"
+clvmr = "=0.2.5"
 
 [lib]
 crate-type = ["rlib"]

chia-tools/Cargo.toml

@@ -10,7 +10,7 @@ repository = "https://github.com/Chia-Network/chia_rs/chia-tools"
 
 [dependencies]
 chia-protocol = { version = ">=0.2.0", path = "../chia-protocol" }
-clvmr = { version = ">=0.2.4", features = ["counters"] }
+clvmr = { version = ">=0.2.5", features = ["counters"] }
 chia = { path = "..", version = ">=0.2.0" }
 sqlite = "=0.30.3"
 clap = { version = "=4.0.29", features = ["derive"] }

clvm-utils/Cargo.toml

@@ -9,4 +9,4 @@ homepage = "https://github.com/Chia-Network/chia_rs/"
 repository = "https://github.com/Chia-Network/chia_rs/clvm-utils"
 
 [dependencies]
-clvmr = "=0.2.4"
+clvmr = "=0.2.5"

clvm-utils/fuzz/Cargo.toml

@@ -10,7 +10,7 @@ cargo-fuzz = true
 
 [dependencies]
 libfuzzer-sys = "0.4"
-clvmr = "=0.2.4"
+clvmr = "=0.2.5"
 
 [dependencies.clvm-utils]
 path = ".."

fuzz/Cargo.toml

@@ -10,7 +10,7 @@ cargo-fuzz = true
 
 [dependencies]
 libfuzzer-sys = "0.4"
-clvmr = "=0.2.4"
+clvmr = "=0.2.5"
 clvm-utils = { path = "../clvm-utils" }
 chia-protocol = { path = "../chia-protocol" }
 chia = { path = ".." }

src/gen/conditions.rs

@@ -1048,7 +1048,7 @@ use crate::gen::flags::ENABLE_ASSERT_BEFORE;
 #[cfg(test)]
 use clvmr::node::Node;
 #[cfg(test)]
-use clvmr::number::{ptr_from_number, Number};
+use clvmr::number::Number;
 #[cfg(test)]
 use clvmr::serde::node_to_bytes;
 #[cfg(test)]
@@ -1189,7 +1189,7 @@ fn parse_list_impl(
     } else if input.starts_with("-") || "0123456789".contains(input.get(0..1).unwrap()) {
         let v = input.split_once(" ").unwrap().0;
         let num = Number::from_str_radix(v, 10).unwrap();
-        (ptr_from_number(a, &num).unwrap(), v.len() + 1)
+        (a.new_number(num).unwrap(), v.len() + 1)
     } else {
         panic!("atom not supported \"{}\"", input);
     }

wheel/Cargo.toml

@@ -17,7 +17,7 @@ path = "src/lib.rs"
 [dependencies]
 chia = { path = "..", features = ["py-bindings"] }
 chia-protocol = { path = "../chia-protocol", features = ["py-bindings"]  }
-clvmr = "=0.2.4"
+clvmr = "=0.2.5"
 pyo3 = { version = "=0.15.1", features = ["extension-module", "multiple-pymethods"] }
 chia_py_streamable_macro = { version= "0.1.3", path = "../chia_py_streamable_macro" }
 chia_streamable_macro = { version = "0.2.4", path = "../chia_streamable_macro" }

wheel/src/api.rs

@@ -31,6 +31,8 @@ use chia_protocol::{
     SubEpochChallengeSegment, SubEpochSegments, SubSlotData, SubSlotProofs, TransactionAck,
     TransactionsInfo, VDFInfo, VDFProof,
 };
+use clvmr::chia_dialect::ENABLE_BLS_OPS;
+use clvmr::chia_dialect::ENABLE_BLS_OPS_OUTSIDE_GUARD;
 use clvmr::serde::tree_hash_from_stream;
 use clvmr::LIMIT_HEAP;
 use clvmr::LIMIT_STACK;
@@ -146,6 +148,8 @@ pub fn chia_rs(py: Python, m: &PyModule) -> PyResult<()> {
     m.add("NO_UNKNOWN_CONDS", NO_UNKNOWN_CONDS)?;
     m.add("STRICT_ARGS_COUNT", STRICT_ARGS_COUNT)?;
     m.add("ENABLE_ASSERT_BEFORE", ENABLE_ASSERT_BEFORE)?;
+    m.add("ENABLE_BLS_OPS", ENABLE_BLS_OPS)?;
+    m.add("ENABLE_BLS_OPS_OUTSIDE_GUARD", ENABLE_BLS_OPS_OUTSIDE_GUARD)?;
     m.add(
         "NO_RELATIVE_CONDITIONS_ON_EPHEMERAL",
         NO_RELATIVE_CONDITIONS_ON_EPHEMERAL,