Use updated clvm_rs. (#98)

* Use updated clvm_rs. * Bump local versions too.
Chia-Network · Dec 6, 2022 · e285fde · e285fde
1 parent 2b3d3b7
commit e285fde
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 19 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,7 +6,7 @@ exclude = ["wheel"]
 
 [package]
 name = "chia"
-version = "0.1.15"
+version = "0.1.16"
 edition = "2021"
 license = "Apache-2.0"
 description = "Utility functions and types used by the Chia blockchain full node"
@@ -18,11 +18,11 @@ repository = "https://github.com/Chia-Network/chia_rs/"
 py-bindings = ["dep:pyo3"]
 
 [dependencies]
-clvmr = "=0.1.24"
+clvmr = "=0.2.0"
 hex = "=0.4.3"
 pyo3 = { version = "=0.15.1", features = ["extension-module"], optional = true }
-clvm-utils = { version = "=0.1.15", path = "clvm-utils" }
-chia-protocol = { version = "=0.1.15", path = "chia-protocol" }
+clvm-utils = { version = "=0.1.16", path = "clvm-utils" }
+chia-protocol = { version = "=0.1.16", path = "chia-protocol" }
 
 [dev-dependencies]
 num-traits = "=0.2.15"

diff --git a/chia-protocol/Cargo.toml b/chia-protocol/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "chia-protocol"
-version = "0.1.15"
+version = "0.1.16"
 edition = "2021"
 license = "Apache-2.0"
 description = "Chia network protocol message types"
@@ -17,7 +17,7 @@ sha2 = "=0.10.2"
 hex = "=0.4.3"
 chia_streamable_macro = { version = "=0.2.3", path = "../chia_streamable_macro" }
 chia_py_streamable_macro = { path = "../chia_py_streamable_macro", version = "=0.1.2", optional = true }
-clvmr = "=0.1.24"
+clvmr = "=0.2.0"
 
 [lib]
 crate-type = ["rlib"]
diff --git a/clvm-utils/Cargo.toml b/clvm-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "clvm-utils"
-version = "0.1.15"
+version = "0.1.16"
 edition = "2021"
 license = "Apache-2.0"
 description = "Utility functions for processing clvm programs and structures"
@@ -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.1.24"
+clvmr = "=0.2.0"
diff --git 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.1.24"
+clvmr = "=0.2.0"
 
 [dependencies.clvm-utils]
 path = ".."

diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
@@ -10,7 +10,7 @@ cargo-fuzz = true
 
 [dependencies]
 libfuzzer-sys = "0.4"
-clvmr = "=0.1.24"
+clvmr = "=0.2.0"
 
 [dependencies.chia]
 path = ".."

diff --git a/src/gen/conditions.rs b/src/gen/conditions.rs
@@ -629,7 +629,7 @@ use clvmr::node::Node;
 #[cfg(test)]
 use clvmr::number::{ptr_from_number, Number};
 #[cfg(test)]
-use clvmr::serialize::node_to_bytes;
+use clvmr::serde::node_to_bytes;
 #[cfg(test)]
 use hex::FromHex;
 #[cfg(test)]

diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "chia_wasm"
-version = "0.1.15"
+version = "0.1.16"
 authors = ["Richard Kiss <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"

diff --git 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.1.24"
+clvmr = "=0.2.0"
 pyo3 = { version = "=0.15.1", features = ["extension-module", "multiple-pymethods"] }
 chia_py_streamable_macro = { version= "0.1.2", path = "../chia_py_streamable_macro" }
 chia_streamable_macro = { version = "0.2.3", path = "../chia_streamable_macro" }

diff --git a/wheel/src/adapt_response.rs b/wheel/src/adapt_response.rs
@@ -1,7 +1,7 @@
 use clvmr::allocator::Allocator;
 use clvmr::node::Node;
 use clvmr::reduction::EvalErr;
-use clvmr::serialize::node_to_bytes;
+use clvmr::serde::node_to_bytes;
 
 use pyo3::prelude::*;
 use pyo3::types::PyDict;

diff --git a/wheel/src/api.rs b/wheel/src/api.rs
@@ -13,7 +13,7 @@ use std::convert::TryInto;
 use clvmr::chia_dialect::LIMIT_HEAP;
 use clvmr::chia_dialect::NO_NEG_DIV;
 use clvmr::chia_dialect::NO_UNKNOWN_OPS;
-use clvmr::serialize::tree_hash_from_stream;
+use clvmr::serde::tree_hash_from_stream;
 use pyo3::prelude::*;
 use pyo3::types::PyBytes;
 use pyo3::types::PyModule;
@@ -34,8 +34,8 @@ use clvmr::node::Node;
 use clvmr::reduction::EvalErr;
 use clvmr::reduction::Reduction;
 use clvmr::run_program::run_program;
-use clvmr::serialize::node_from_bytes;
-use clvmr::serialize::node_to_bytes;
+use clvmr::serde::node_from_bytes;
+use clvmr::serde::node_to_bytes;
 
 pub const MEMPOOL_MODE: u32 =
     NO_NEG_DIV | NO_UNKNOWN_CONDS | NO_UNKNOWN_OPS | COND_ARGS_NIL | STRICT_ARGS_COUNT | LIMIT_HEAP;

diff --git a/wheel/src/run_generator.rs b/wheel/src/run_generator.rs
@@ -12,7 +12,7 @@ use clvmr::chia_dialect::LIMIT_HEAP;
 use clvmr::cost::Cost;
 use clvmr::reduction::{EvalErr, Reduction};
 use clvmr::run_program::run_program;
-use clvmr::serialize::node_from_bytes;
+use clvmr::serde::node_from_bytes;
 
 use pyo3::prelude::*;
 

diff --git a/wheel/src/run_program.rs b/wheel/src/run_program.rs
@@ -4,7 +4,7 @@ use clvmr::chia_dialect::ChiaDialect;
 use clvmr::cost::Cost;
 use clvmr::reduction::Response;
 use clvmr::run_program::run_program;
-use clvmr::serialize::{node_from_bytes, serialized_length_from_bytes};
+use clvmr::serde::{node_from_bytes, serialized_length_from_bytes};
 use pyo3::prelude::*;
 use pyo3::types::{PyBytes, PyTuple};
 use std::rc::Rc;