fix feature compilations

Author: ananas-block

Cargo.toml

@@ -122,11 +122,11 @@ pinocchio-system = { version = "0.3.0" }
 bs58 = "^0.5.1"
 litesvm = "0.7"
 # Anchor
-anchor-lang = { version = "=0.31.1" }
-anchor-spl = "=0.31.1"
+anchor-lang = { version = "0.31.1" }
+anchor-spl = "0.31.1"
 
 # Anchor compatibility
-borsh = "0.10.0"
+borsh = { version = "0.10.4", default-features = false }
 
 # Serialization
 serde = { version = "1.0", features = ["derive"] }
@@ -182,7 +182,7 @@ light-compressible = { path = "program-libs/compressible", version = "0.1.0" }
 light-ctoken-types = { path = "program-libs/ctoken-types", version = "0.1.0" }
 light-account-checks = { path = "program-libs/account-checks", version = "0.4.0", default-features = false }
 light-verifier = { path = "program-libs/verifier", version = "4.0.0" }
-light-zero-copy = { path = "program-libs/zero-copy", version = "0.4.0" }
+light-zero-copy = { path = "program-libs/zero-copy", version = "0.4.0", default-features = false }
 light-zero-copy-derive = { path = "program-libs/zero-copy-derive", version = "0.4.0" }
 photon-api = { path = "sdk-libs/photon-api", version = "0.52.0" }
 forester-utils = { path = "forester-utils", version = "2.0.0" }

program-libs/account-checks/Cargo.toml

@@ -16,7 +16,7 @@ solana = [
     "solana-pubkey",
 ]
 pinocchio = ["dep:pinocchio"]
-test-only = ["dep:rand"]
+test-only = ["dep:rand", "std"]
 
 [dependencies]
 solana-sysvar = { workspace = true, optional = true, features = ["bincode"] }

program-libs/batched-merkle-tree/src/errors.rs

@@ -36,7 +36,7 @@ pub enum BatchedMerkleTreeError {
     #[cfg(feature = "pinocchio")]
     #[error("Program error {0}")]
     ProgramError(u64),
-    #[cfg(not(feature = "pinocchio"))]
+    #[cfg(all(feature = "solana", not(feature = "pinocchio")))]
     #[error("Program error {0}")]
     ProgramError(#[from] solana_program_error::ProgramError),
     #[error("Verifier error {0}")]
@@ -76,6 +76,7 @@ impl From<BatchedMerkleTreeError> for u32 {
             BatchedMerkleTreeError::BloomFilter(e) => e.into(),
             BatchedMerkleTreeError::VerifierErrorError(e) => e.into(),
             BatchedMerkleTreeError::CompressedAccountError(e) => e.into(),
+            #[cfg(any(feature = "pinocchio", feature = "solana"))]
             #[allow(clippy::useless_conversion)]
             BatchedMerkleTreeError::ProgramError(e) => u32::try_from(u64::from(e)).unwrap(),
             BatchedMerkleTreeError::AccountError(e) => e.into(),

program-libs/compressed-account/Cargo.toml

@@ -11,7 +11,7 @@ default = ["alloc"]
 alloc = ["light-hasher/alloc"]
 std = ["alloc", "borsh/std", "dep:solana-msg", "light-zero-copy/std"]
 solana = ["dep:solana-pubkey", "dep:solana-program-error"]
-anchor = ["anchor-lang"]
+anchor = ["anchor-lang", "std"]
 pinocchio = ["dep:pinocchio"]
 bytemuck-des = ["bytemuck"]
 new-unique = ["dep:solana-pubkey"]

program-libs/compressed-account/src/instruction_data/traits.rs

@@ -1,10 +1,9 @@
 use core::fmt::Debug;
 
-#[cfg(feature = "std")]
-#[cfg(feature = "anchor")]
+#[cfg(all(feature = "std", feature = "anchor"))]
 use anchor_lang::AnchorSerialize;
 #[allow(unused_imports)]
-#[cfg(not(feature = "anchor"))]
+#[cfg(not(all(feature = "std", feature = "anchor")))]
 use borsh::BorshSerialize as AnchorSerialize;
 use light_program_profiler::profile;
 use tinyvec::ArrayVec;

program-libs/compressible/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [features]
 default = ["pinocchio", "solana"]
 solana = ["dep:solana-program-error", "light-compressed-account/solana", "solana-sysvar"]
-anchor = ["anchor-lang", "light-compressed-account/anchor"]
+anchor = ["anchor-lang", "light-compressed-account/anchor", "light-compressed-account/std"]
 pinocchio = ["light-compressed-account/pinocchio"]
 profile-program = []
 profile-heap = ["dep:light-heap"]

program-libs/hasher/tests/hash_to_field_size.rs

@@ -1,16 +1,15 @@
 #![cfg(feature = "std")]
-use std::vec::Vec;
 
 #[cfg(feature = "poseidon")]
 use ark_ff::PrimeField;
 use borsh::{BorshDeserialize, BorshSerialize};
+#[cfg(feature = "solana")]
+use light_hasher::hash_to_field_size::hashv_to_bn254_field_size_be;
 #[cfg(all(not(target_os = "solana"), feature = "poseidon"))]
 use light_hasher::hash_to_field_size::is_smaller_than_bn254_field_size_be;
 use light_hasher::{
     bigint::bigint_to_be_bytes_array,
-    hash_to_field_size::{
-        hash_to_bn254_field_size_be, hashv_to_bn254_field_size_be, HashToFieldSize,
-    },
+    hash_to_field_size::{hash_to_bn254_field_size_be, HashToFieldSize},
 };
 use num_bigint::{BigUint, ToBigUint};
 

program-libs/zero-copy/tests/borsh.rs

@@ -285,21 +285,20 @@ pub struct ArrayStruct {
 }
 
 #[test]
-fn test_array_struct() -> Result<(), Box<dyn std::error::Error>> {
+fn test_array_struct() {
     let array_struct = ArrayStruct {
         a: [1u8; 32],
         b: [2u8; 64],
         c: [3u8; 32],
     };
-    let bytes = array_struct.try_to_vec()?;
+    let bytes = array_struct.try_to_vec().unwrap();
 
     let (zero_copy, remaining) = ArrayStruct::zero_copy_at(&bytes).unwrap();
     assert_eq!(zero_copy.a, [1u8; 32]);
     assert_eq!(zero_copy.b, [2u8; 64]);
     assert_eq!(zero_copy.c, [3u8; 32]);
     assert_eq!(zero_copy, array_struct);
     assert_eq!(remaining, &[]);
-    Ok(())
 }
 
 #[repr(C)]

scripts/lint.sh

@@ -7,9 +7,106 @@ npx nx run-many --target=lint --all
 cargo +nightly fmt --all -- --check
 cargo clippy --workspace --all-features --all-targets -- -D warnings
 
-# Check no_std compatibility for light-zero-copy crate
-echo "Checking no_std compatibility for light-zero-copy..."
-cargo check -p light-zero-copy --no-default-features
-cargo check -p light-compressed-account --no-default-features
-cargo check -p light-sdk-types --no-default-features
-cargo check -p light-sdk-pinocchio --no-default-features
+echo "Testing feature combinations..."
+
+# Test no-default-features for all library crates
+echo "Testing all library crates with --no-default-features..."
+NO_DEFAULT_CRATES=(
+    "light-account-checks"
+    "light-batched-merkle-tree"
+    "light-bloom-filter"
+    "light-compressed-account"
+    "light-compressible"
+    "light-concurrent-merkle-tree"
+    "light-ctoken-types"
+    "light-hash-set"
+    "light-hasher"
+    "light-indexed-merkle-tree"
+    "light-macros"
+    "light-merkle-tree-metadata"
+    "light-verifier"
+    "light-zero-copy"
+    "light-heap"
+    "light-array-map"
+    "light-indexed-array"
+    "aligned-sized"
+    "light-sdk-types"
+    "light-sdk-pinocchio"
+    "light-sdk-macros"
+    "light-compressed-token-sdk"
+    "light-compressed-token-types"
+    "light-sdk"
+)
+
+for crate in "${NO_DEFAULT_CRATES[@]}"; do
+    echo "Checking $crate with --no-default-features..."
+    cargo check -p "$crate" --no-default-features
+done
+
+# Test pinocchio feature for all crates that have it
+PINOCCHIO_CRATES=(
+    "light-hasher"
+    "light-indexed-merkle-tree"
+    "light-zero-copy"
+    "light-bloom-filter"
+    "light-compressed-account"
+    "light-merkle-tree-metadata"
+    "light-macros"
+    "light-batched-merkle-tree"
+    "light-concurrent-merkle-tree"
+    "light-verifier"
+    "light-account-checks"
+    "light-compressible"
+)
+
+for crate in "${PINOCCHIO_CRATES[@]}"; do
+    echo "Checking $crate with pinocchio feature..."
+    cargo check -p "$crate" --features pinocchio
+done
+
+# Test solana feature for all crates that have it
+SOLANA_CRATES=(
+    "light-hasher"
+    "light-indexed-merkle-tree"
+    "light-zero-copy"
+    "light-bloom-filter"
+    "light-compressed-account"
+    "light-hash-set"
+    "light-merkle-tree-metadata"
+    "light-ctoken-types"
+    "light-macros"
+    "light-batched-merkle-tree"
+    "light-concurrent-merkle-tree"
+    "light-verifier"
+    "light-account-checks"
+    "light-compressible"
+)
+
+for crate in "${SOLANA_CRATES[@]}"; do
+    echo "Checking $crate with solana feature..."
+    cargo check -p "$crate" --features solana
+done
+
+# Test anchor feature for all crates that have it
+ANCHOR_CRATES=(
+    "light-indexed-merkle-tree"
+    "light-compressed-account"
+    "light-merkle-tree-metadata"
+    "light-ctoken-types"
+    "light-verifier"
+    "light-compressible"
+    "light-sdk-types"
+    "light-sdk"
+    "light-compressed-token-sdk"
+    "light-compressed-token-types"
+)
+
+for crate in "${ANCHOR_CRATES[@]}"; do
+    echo "Checking $crate with anchor feature..."
+    cargo check -p "$crate" --features anchor
+done
+
+for crate in "${NO_DEFAULT_CRATES[@]}"; do
+    echo "Checking $crate with --no-default-features..."
+    cargo test -p "$crate" --no-run
+done

sdk-libs/compressed-token-sdk/Cargo.toml

@@ -47,7 +47,7 @@ light-program-profiler = { workspace = true }
 anchor-lang = { workspace = true, optional = true }
 
 [dev-dependencies]
-light-account-checks = { workspace = true, features = ["test-only", "pinocchio"] }
+light-account-checks = { workspace = true, features = ["test-only", "pinocchio", "std"] }
 anchor-lang = { workspace = true }
 light-compressed-token = { workspace = true }
 pinocchio = { workspace = true }