From c70e8c188b888b25067a6393c82c094ebf435ef8 Mon Sep 17 00:00:00 2001 From: arvidn Date: Thu, 25 May 2023 11:58:06 +0200 Subject: [PATCH] bump clvm_rs dependency to 0.2.5 --- Cargo.toml | 2 +- chia-protocol/Cargo.toml | 4 ++-- chia-tools/Cargo.toml | 2 +- clvm-utils/Cargo.toml | 2 +- clvm-utils/fuzz/Cargo.toml | 2 +- fuzz/Cargo.toml | 2 +- src/gen/conditions.rs | 4 ++-- wheel/Cargo.toml | 2 +- wheel/src/api.rs | 4 ++++ 9 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9e3f686a2..9c050552b 100644 --- a/Cargo.toml +++ b/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" } diff --git a/chia-protocol/Cargo.toml b/chia-protocol/Cargo.toml index 90bdedad5..12f7d9f9f 100644 --- a/chia-protocol/Cargo.toml +++ b/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"] diff --git a/chia-tools/Cargo.toml b/chia-tools/Cargo.toml index b0eb5a282..b9dc667f3 100644 --- a/chia-tools/Cargo.toml +++ b/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"] } diff --git a/clvm-utils/Cargo.toml b/clvm-utils/Cargo.toml index 9d684ff74..e4f276fb5 100644 --- a/clvm-utils/Cargo.toml +++ b/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" diff --git a/clvm-utils/fuzz/Cargo.toml b/clvm-utils/fuzz/Cargo.toml index 7333c90a3..f0576dadb 100644 --- a/clvm-utils/fuzz/Cargo.toml +++ b/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 = ".." diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index c8091e600..9b05ac6df 100644 --- a/fuzz/Cargo.toml +++ b/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 = ".." } diff --git a/src/gen/conditions.rs b/src/gen/conditions.rs index 18723bd3a..8d6437d55 100644 --- a/src/gen/conditions.rs +++ b/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); } diff --git a/wheel/Cargo.toml b/wheel/Cargo.toml index 347356a95..702faffd8 100644 --- a/wheel/Cargo.toml +++ b/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" } diff --git a/wheel/src/api.rs b/wheel/src/api.rs index c65bac9ac..a1e2ae12b 100644 --- a/wheel/src/api.rs +++ b/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,