type-length-value: no-std support

type-length-value/Cargo.toml

@@ -14,15 +14,14 @@ derive = ["dep:spl-type-length-value-derive", "solana-program-error/borsh"]
 [dependencies]
 bytemuck = { version = "1.23.2", features = ["derive"] }
 num-derive = "0.4"
-num_enum = "0.7"
-num-traits = "0.2"
-solana-account-info = "3.0.0"
-solana-msg = "3.0.0"
+num_enum = { version = "0.7", default-features = false }
+num-traits = { version = "0.2", default-features = false }
+solana-account-info = "3.1.1"
 solana-program-error = "3.0.0"
+solana-zero-copy = { version = "1.0.0", features = ["bytemuck"] }
 spl-discriminator = { version = "0.5.1", path = "../discriminator" }
 spl-type-length-value-derive = { version = "0.2", path = "../type-length-value-derive", optional = true }
-spl-pod = { version = "0.7.1", path = "../pod", features = ["bytemuck"] }
-thiserror = "2.0"
+thiserror = { version = "2.0", default-features = false }
 
 [lib]
 crate-type = ["lib"]

type-length-value/src/length.rs

@@ -2,13 +2,13 @@
 use {
     bytemuck::{Pod, Zeroable},
     solana_program_error::ProgramError,
-    spl_pod::primitives::PodU32,
+    solana_zero_copy::unaligned::U32,
 };
 
 /// Length in TLV structure
 #[derive(Clone, Copy, Debug, Default, PartialEq, Pod, Zeroable)]
 #[repr(transparent)]
-pub struct Length(PodU32);
+pub struct Length(U32);
 impl TryFrom<Length> for usize {
     type Error = ProgramError;
     fn try_from(n: Length) -> Result<Self, Self::Error> {
@@ -19,7 +19,7 @@ impl TryFrom<usize> for Length {
     type Error = ProgramError;
     fn try_from(n: usize) -> Result<Self, Self::Error> {
         u32::try_from(n)
-            .map(|v| Self(PodU32::from(v)))
+            .map(|v| Self(U32::from(v)))
             .map_err(|_| ProgramError::AccountDataTooSmall)
     }
 }

type-length-value/src/lib.rs

@@ -3,8 +3,11 @@
 
 #![allow(clippy::arithmetic_side_effects)]
 #![deny(missing_docs)]
+#![no_std]
 #![cfg_attr(not(test), forbid(unsafe_code))]
 
+extern crate alloc;
+
 pub mod error;
 pub mod length;
 pub mod state;

type-length-value/src/state.rs

@@ -2,14 +2,22 @@
 
 use {
     crate::{error::TlvError, length::Length, variable_len_pack::VariableLenPack},
-    bytemuck::Pod,
+    alloc::{vec, vec::Vec},
+    bytemuck::{try_from_bytes, try_from_bytes_mut, Pod},
+    core::{cmp::Ordering, mem::size_of},
     solana_account_info::AccountInfo,
     solana_program_error::ProgramError,
     spl_discriminator::{ArrayDiscriminator, SplDiscriminate},
-    spl_pod::bytemuck::{pod_from_bytes, pod_from_bytes_mut},
-    std::{cmp::Ordering, mem::size_of},
 };
 
+fn pod_from_bytes<T: Pod>(bytes: &[u8]) -> Result<&T, ProgramError> {
+    try_from_bytes(bytes).map_err(|_| ProgramError::InvalidArgument)
+}
+
+fn pod_from_bytes_mut<T: Pod>(bytes: &mut [u8]) -> Result<&mut T, ProgramError> {
+    try_from_bytes_mut(bytes).map_err(|_| ProgramError::InvalidArgument)
+}
+
 /// Get the current `TlvIndices` from the current spot
 const fn get_indices_unchecked(type_start: usize, value_repetition_number: usize) -> TlvIndices {
     let length_start = type_start.saturating_add(size_of::<ArrayDiscriminator>());
@@ -611,6 +619,7 @@ fn check_data(tlv_data: &[u8]) -> Result<(), ProgramError> {
 mod test {
     use {
         super::*,
+        alloc::string::{String, ToString},
         bytemuck::{Pod, Zeroable},
     };
 
@@ -1142,7 +1151,7 @@ mod test {
             if src[8..8 + length].len() != length {
                 return Err(ProgramError::InvalidAccountData);
             }
-            let data = std::str::from_utf8(&src[8..8 + length])
+            let data = core::str::from_utf8(&src[8..8 + length])
                 .unwrap()
                 .to_string();
             Ok(Self { data })