Merge pull request #405 from Chia-Network/bump-clvm-0.6.0

Bump clvm 0.6.0
Chia-Network · Feb 15, 2024 · deec42d · deec42d
2 parents 5b1b20a + b9a92c3
commit deec42d
Show file tree

Hide file tree

Showing 29 changed files with 172 additions and 153 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -35,7 +35,7 @@ repository = "https://github.com/Chia-Network/chia_rs/"
 py-bindings = ["dep:pyo3"]
 
 [dependencies]
-clvmr = "0.5.0"
+clvmr = "0.6.0"
 hex = "0.4.3"
 pyo3 = { version = ">=0.19.0", optional = true }
 clvm-utils = { version = "0.5.1", path = "clvm-utils" }

diff --git a/chia-protocol/Cargo.toml b/chia-protocol/Cargo.toml
@@ -17,7 +17,7 @@ sha2 = "0.10.8"
 hex = "0.4.3"
 chia_streamable_macro = { version = "0.3.0", path = "../chia_streamable_macro" }
 chia_py_streamable_macro = { version = "0.5.1", path = "../chia_py_streamable_macro", optional = true }
-clvmr = "0.5.0"
+clvmr = "0.6.0"
 chia-traits = { version = "0.5.1", path = "../chia-traits" }
 clvm-traits = { version = "0.5.1", path = "../clvm-traits", features = ["derive"] }
 clvm-utils = { version = "0.5.1", path = "../clvm-utils" }

diff --git a/chia-protocol/fuzz/Cargo.toml b/chia-protocol/fuzz/Cargo.toml
@@ -10,7 +10,7 @@ cargo-fuzz = true
 
 [dependencies]
 libfuzzer-sys = "0.4"
-clvmr = "0.5.0"
+clvmr = "0.6.0"
 chia-traits = { path = "../../chia-traits" }
 clvm-traits = { path = "../../clvm-traits" }
 arbitrary = { version = "=1.3.0" }

diff --git a/chia-protocol/fuzz/fuzz_targets/spend-bundle.rs b/chia-protocol/fuzz/fuzz_targets/spend-bundle.rs
@@ -39,10 +39,10 @@ fuzz_target!(|data: &[u8]| {
             let op = first(&a, c).expect("first");
             let c = rest(&a, c).expect("rest");
             let buf = a.atom(op);
-            if buf.len() != 1 {
+            if buf.as_ref().len() != 1 {
                 continue;
             }
-            if buf[0] == 51 {
+            if buf.as_ref()[0] == 51 {
                 let (puzzle_hash, (amount, _)) =
                     <(Bytes32, (u64, NodePtr))>::from_clvm(&a, c).expect("parse spend");
                 expected.insert(Coin {

diff --git a/chia-protocol/src/bytes.rs b/chia-protocol/src/bytes.rs
@@ -114,7 +114,7 @@ impl<N> ToClvm<N> for Bytes {
 impl<N> FromClvm<N> for Bytes {
     fn from_clvm(decoder: &impl ClvmDecoder<Node = N>, node: N) -> Result<Self, FromClvmError> {
         let bytes = decoder.decode_atom(&node)?;
-        Ok(Self(bytes.to_vec()))
+        Ok(Self(bytes.as_ref().to_vec()))
     }
 }
 
@@ -247,13 +247,13 @@ impl<N, const LEN: usize> ToClvm<N> for BytesImpl<LEN> {
 impl<N, const LEN: usize> FromClvm<N> for BytesImpl<LEN> {
     fn from_clvm(decoder: &impl ClvmDecoder<Node = N>, node: N) -> Result<Self, FromClvmError> {
         let bytes = decoder.decode_atom(&node)?;
-        if bytes.len() != LEN {
+        if bytes.as_ref().len() != LEN {
             return Err(FromClvmError::WrongAtomLength {
                 expected: LEN,
-                found: bytes.len(),
+                found: bytes.as_ref().len(),
             });
         }
-        Ok(Self::try_from(bytes).unwrap())
+        Ok(Self::try_from(bytes.as_ref()).unwrap())
     }
 }
 

diff --git a/chia-protocol/src/lazy_node.rs b/chia-protocol/src/lazy_node.rs
@@ -36,7 +36,7 @@ impl LazyNode {
     #[getter(atom)]
     pub fn atom(&self, py: Python) -> Option<PyObject> {
         match &self.allocator.sexp(self.node) {
-            SExp::Atom => Some(PyBytes::new(py, self.allocator.atom(self.node)).into()),
+            SExp::Atom => Some(PyBytes::new(py, self.allocator.atom(self.node).as_ref()).into()),
             _ => None,
         }
     }

diff --git a/chia-protocol/src/spend_bundle.rs b/chia-protocol/src/spend_bundle.rs
@@ -70,6 +70,7 @@ impl SpendBundle {
                         return Err(EvalErr(op, "invalid condition".to_string()));
                     }
                 };
+                let buf = buf.as_ref();
                 if buf.len() != 1 {
                     continue;
                 }

diff --git a/chia-tools/Cargo.toml b/chia-tools/Cargo.toml
@@ -15,7 +15,7 @@ clvm-utils = { version = "0.5.1", path = "../clvm-utils" }
 clvm-traits = { version = "0.5.2", path = "../clvm-traits" }
 chia-wallet = { version = "0.5.1", path = "../chia-wallet" }
 chia-bls = { version = "0.5.1", path = "../chia-bls" }
-clvmr = { version = "0.5.0", features = ["counters"] }
+clvmr = { version = "0.6.0", features = ["counters"] }
 chia = { version = "0.5.2", path = ".." }
 rusqlite = { version = "0.30.0", features = ["bundled"] }
 clap = { version = "4.3.9", features = ["derive"] }

diff --git a/chia-tools/src/visit_spends.rs b/chia-tools/src/visit_spends.rs
@@ -131,7 +131,7 @@ pub fn visit_spends<
         let [parent_id, puzzle, amount, solution, _spend_level_extra] =
             extract_n::<5>(a, spend, ErrorCode::InvalidCondition)?;
         let amount: u64 = a.number(amount).try_into().expect("invalid amount");
-        let parent_id = Bytes32::try_from(a.atom(parent_id)).unwrap();
+        let parent_id = Bytes32::try_from(a.atom(parent_id).as_ref()).unwrap();
         callback(a, parent_id, amount, puzzle, solution);
     }
     Ok(())

diff --git a/chia-wallet/Cargo.toml b/chia-wallet/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://github.com/Chia-Network/chia_rs/chia-wallet/"
 repository = "https://github.com/Chia-Network/chia_rs/chia-wallet/"
 
 [dependencies]
-clvmr = "0.5.0"
+clvmr = "0.6.0"
 sha2 = "0.10.8"
 num-bigint = "0.4.3"
 hex-literal = "0.4.1"

diff --git a/chia-wallet/fuzz/Cargo.toml b/chia-wallet/fuzz/Cargo.toml
@@ -10,7 +10,7 @@ cargo-fuzz = true
 
 [dependencies]
 libfuzzer-sys = "0.4"
-clvmr = "0.5.0"
+clvmr = "0.6.0"
 pyo3 = { version = ">=0.19.0", features = ["auto-initialize"]}
 chia-wallet = { path = ".." }
 clvm-traits = { version = "0.5.2", path = "../../clvm-traits" }

diff --git a/clvm-traits/Cargo.toml b/clvm-traits/Cargo.toml
@@ -18,7 +18,7 @@ py-bindings = ["dep:pyo3"]
 
 [dependencies]
 pyo3 = { version = ">=0.19.0", optional = true }
-clvmr = "0.5.0"
+clvmr = "0.6.0"
 clvm-derive = { version = "0.5.2", path = "../clvm-derive", optional = true }
 chia-bls = { version = "0.5.1", path = "../chia-bls", optional = true }
 num-bigint = "0.4.3"

diff --git a/clvm-traits/src/clvm_decoder.rs b/clvm-traits/src/clvm_decoder.rs
@@ -1,11 +1,11 @@
-use clvmr::{allocator::SExp, Allocator, NodePtr};
+use clvmr::{allocator::SExp, Allocator, Atom, NodePtr};
 
 use crate::{FromClvm, FromClvmError};
 
 pub trait ClvmDecoder {
     type Node: Clone;
 
-    fn decode_atom(&self, node: &Self::Node) -> Result<&[u8], FromClvmError>;
+    fn decode_atom(&self, node: &Self::Node) -> Result<Atom, FromClvmError>;
     fn decode_pair(&self, node: &Self::Node) -> Result<(Self::Node, Self::Node), FromClvmError>;
 
     /// This is a helper function that just calls `clone` on the node.
@@ -19,7 +19,7 @@ pub trait ClvmDecoder {
 impl ClvmDecoder for Allocator {
     type Node = NodePtr;
 
-    fn decode_atom(&self, node: &Self::Node) -> Result<&[u8], FromClvmError> {
+    fn decode_atom(&self, node: &Self::Node) -> Result<Atom, FromClvmError> {
         if let SExp::Atom = self.sexp(*node) {
             Ok(self.atom(*node))
         } else {

diff --git a/clvm-traits/src/from_clvm.rs b/clvm-traits/src/from_clvm.rs
@@ -16,7 +16,7 @@ macro_rules! clvm_primitive {
                 const LEN: usize = std::mem::size_of::<$primitive>();
 
                 let bytes = decoder.decode_atom(&node)?;
-                let number = BigInt::from_signed_bytes_be(bytes);
+                let number = BigInt::from_signed_bytes_be(bytes.as_ref());
                 let (sign, mut vec) = number.to_bytes_be();
 
                 if vec.len() < std::mem::size_of::<$primitive>() {
@@ -28,7 +28,7 @@ macro_rules! clvm_primitive {
                 let value = <$primitive>::from_be_bytes(vec.as_slice().try_into().or(Err(
                     FromClvmError::WrongAtomLength {
                         expected: LEN,
-                        found: bytes.len(),
+                        found: bytes.as_ref().len(),
                     },
                 ))?);
 
@@ -71,12 +71,12 @@ where
 impl<N> FromClvm<N> for () {
     fn from_clvm(decoder: &impl ClvmDecoder<Node = N>, node: N) -> Result<Self, FromClvmError> {
         let bytes = decoder.decode_atom(&node)?;
-        if bytes.is_empty() {
+        if bytes.as_ref().is_empty() {
             Ok(())
         } else {
             Err(FromClvmError::WrongAtomLength {
                 expected: 0,
-                found: bytes.len(),
+                found: bytes.as_ref().len(),
             })
         }
     }
@@ -98,12 +98,12 @@ where
                 }
             } else {
                 let bytes = decoder.decode_atom(&node)?;
-                if bytes.is_empty() {
+                if bytes.as_ref().is_empty() {
                     return items.try_into().or(Err(FromClvmError::ExpectedPair));
                 } else {
                     return Err(FromClvmError::WrongAtomLength {
                         expected: 0,
-                        found: bytes.len(),
+                        found: bytes.as_ref().len(),
                     });
                 }
             }
@@ -123,12 +123,12 @@ where
                 node = rest;
             } else {
                 let bytes = decoder.decode_atom(&node)?;
-                if bytes.is_empty() {
+                if bytes.as_ref().is_empty() {
                     return Ok(items);
                 } else {
                     return Err(FromClvmError::WrongAtomLength {
                         expected: 0,
-                        found: bytes.len(),
+                        found: bytes.as_ref().len(),
                     });
                 }
             }
@@ -141,18 +141,19 @@ where
     T: FromClvm<N>,
 {
     fn from_clvm(decoder: &impl ClvmDecoder<Node = N>, node: N) -> Result<Self, FromClvmError> {
-        if let Ok(&[]) = decoder.decode_atom(&node) {
-            Ok(None)
-        } else {
-            Ok(Some(T::from_clvm(decoder, node)?))
+        if let Ok(atom) = decoder.decode_atom(&node) {
+            if atom.as_ref().is_empty() {
+                return Ok(None);
+            }
         }
+        Ok(Some(T::from_clvm(decoder, node)?))
     }
 }
 
 impl<N> FromClvm<N> for String {
     fn from_clvm(decoder: &impl ClvmDecoder<Node = N>, node: N) -> Result<Self, FromClvmError> {
         let bytes = decoder.decode_atom(&node)?;
-        Ok(Self::from_utf8(bytes.to_vec())?)
+        Ok(Self::from_utf8(bytes.as_ref().to_vec())?)
     }
 }
 
@@ -162,10 +163,10 @@ impl<N> FromClvm<N> for chia_bls::PublicKey {
         let bytes = decoder.decode_atom(&node)?;
         let error = Err(FromClvmError::WrongAtomLength {
             expected: 48,
-            found: bytes.len(),
+            found: bytes.as_ref().len(),
         });
-        let bytes = bytes.try_into().or(error)?;
-        Self::from_bytes(bytes).map_err(|error| FromClvmError::Custom(error.to_string()))
+        let bytes: [u8; 48] = bytes.as_ref().try_into().or(error)?;
+        Self::from_bytes(&bytes).map_err(|error| FromClvmError::Custom(error.to_string()))
     }
 }
 
@@ -175,10 +176,10 @@ impl<N> FromClvm<N> for chia_bls::Signature {
         let bytes = decoder.decode_atom(&node)?;
         let error = Err(FromClvmError::WrongAtomLength {
             expected: 96,
-            found: bytes.len(),
+            found: bytes.as_ref().len(),
         });
-        let bytes = bytes.try_into().or(error)?;
-        Self::from_bytes(bytes).map_err(|error| FromClvmError::Custom(error.to_string()))
+        let bytes: [u8; 96] = bytes.as_ref().try_into().or(error)?;
+        Self::from_bytes(&bytes).map_err(|error| FromClvmError::Custom(error.to_string()))
     }
 }
 

diff --git a/clvm-traits/src/match_byte.rs b/clvm-traits/src/match_byte.rs
@@ -18,7 +18,7 @@ impl<N, const BYTE: u8> ToClvm<N> for MatchByte<BYTE> {
 
 impl<N, const BYTE: u8> FromClvm<N> for MatchByte<BYTE> {
     fn from_clvm(decoder: &impl ClvmDecoder<Node = N>, node: N) -> Result<Self, FromClvmError> {
-        match decoder.decode_atom(&node)? {
+        match decoder.decode_atom(&node)?.as_ref() {
             [] if BYTE == 0 => Ok(Self),
             [byte] if *byte == BYTE && BYTE > 0 => Ok(Self),
             _ => Err(FromClvmError::Custom(format!(

diff --git a/clvm-utils/Cargo.toml b/clvm-utils/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://github.com/Chia-Network/chia_rs/"
 repository = "https://github.com/Chia-Network/chia_rs/clvm-utils"
 
 [dependencies]
-clvmr = "0.5.0"
+clvmr = "0.6.0"
 clvm-traits = { version = "0.5.1", path = "../clvm-traits" }
 
 [dev-dependencies]

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.5.0"
+clvmr = "=0.6.0"
 chia-fuzz = { path = "../../fuzz" }
 clvm-utils = { path = ".." }
 clvm-traits = { path = "../../clvm-traits" }

diff --git a/clvm-utils/src/tree_hash.rs b/clvm-utils/src/tree_hash.rs
@@ -31,7 +31,7 @@ pub fn tree_hash(a: &Allocator, node: NodePtr) -> [u8; 32] {
         match op {
             TreeOp::SExp(node) => match a.sexp(node) {
                 SExp::Atom => {
-                    hashes.push(tree_hash_atom(a.atom(node)));
+                    hashes.push(tree_hash_atom(a.atom(node).as_ref()));
                 }
                 SExp::Pair(left, right) => {
                     ops.push(TreeOp::Cons);

diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
@@ -10,7 +10,7 @@ cargo-fuzz = true
 
 [dependencies]
 libfuzzer-sys = "0.4"
-clvmr = "0.5.0"
+clvmr = "0.6.0"
 clvm-utils = { path = "../clvm-utils" }
 clvm-traits = { path = "../clvm-traits" }
 chia-protocol = { path = "../chia-protocol" }

diff --git a/src/gen/condition_sanitizers.rs b/src/gen/condition_sanitizers.rs
@@ -10,7 +10,7 @@ pub fn sanitize_hash(
 ) -> Result<NodePtr, ValidationErr> {
     let buf = atom(a, n, code)?;
 
-    if buf.len() != size {
+    if buf.as_ref().len() != size {
         Err(ValidationErr(n, code))
     } else {
         Ok(n)
@@ -33,7 +33,7 @@ pub fn sanitize_announce_msg(
 ) -> Result<NodePtr, ValidationErr> {
     let buf = atom(a, n, code)?;
 
-    if buf.len() > 1024 {
+    if buf.as_ref().len() > 1024 {
         Err(ValidationErr(n, code))
     } else {
         Ok(n)