fix: compile time errors

Author: ananas-block

Cargo.lock

@@ -1,7 +1,7 @@
 use borsh::{BorshDeserialize, BorshSerialize};
 #[cfg(feature = "bytemuck-des")]
 use bytemuck::{Pod, Zeroable};
-use light_hasher::bytes::AsByteVec;
+use light_hasher::{to_byte_array::ToByteArray, HasherError};
 use light_zero_copy::{borsh::Deserialize, borsh_mut::DeserializeMut, errors::ZeroCopyError};
 use solana_program::pubkey;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout, Ref, Unaligned};
@@ -140,8 +140,19 @@ impl Pubkey {
     }
 }
 
-impl AsByteVec for Pubkey {
-    fn as_byte_vec(&self) -> Vec<Vec<u8>> {
-        vec![self.to_bytes().to_vec()]
+impl ToByteArray for Pubkey {
+    const NUM_FIELDS: usize = 1;
+
+    fn to_byte_array(&self) -> Result<[u8; 32], HasherError> {
+        Ok(self.to_bytes())
+    }
+
+    fn to_byte_arrays<const NUM_FIELDS: usize>(
+        &self,
+    ) -> Result<[[u8; 32]; NUM_FIELDS], HasherError> {
+        if Self::NUM_FIELDS != NUM_FIELDS {
+            return Err(HasherError::InvalidNumFields);
+        }
+        Ok([self.to_byte_array()?; NUM_FIELDS])
     }
 }

program-libs/compressed-account/src/pubkey.rs

@@ -131,7 +131,7 @@ pub fn update_pda(accounts: &[AccountInfo], instruction_data: &[u8]) -> Result<(
     // Could implement into LightInputAccountInfo. Could we derive it? #[into_light_input_account_info] (will detect whether lamports, etc exist)
     let input_metadata = LightInputAccountInfo::from_input_account_meta_with_address_no_lamports(
         &instruction_data.input_compressed_account.meta,
-        input_my_compressed_account.hash::<Poseidon>().unwrap(),
+        input_my_compressed_account.hash().unwrap(),
     )
     .unwrap();
 

program-tests/sdk-test/src/lib.rs

@@ -106,7 +106,7 @@ fn insert_nullifier<'a, 'c: 'info, 'info>(
     {
         let merkle_tree = ctx.accounts.merkle_tree.load()?;
 
-        if merkle_tree.metadata.associated_queue != ctx.accounts.nullifier_queue.key().into() {
+        if merkle_tree.metadata.associated_queue != <anchor_lang::prelude::Pubkey as Into<light_compressed_account::pubkey::Pubkey>>::into(ctx.accounts.nullifier_queue.key()) {
             msg!(
             "Merkle tree and nullifier queue are not associated. Merkle tree associated nullifier queue {:?} != nullifier queue {}",
             merkle_tree.metadata.associated_queue,

programs/account-compression/src/instructions/nullify_leaves.rs

@@ -56,7 +56,9 @@ pub fn process_update_address_merkle_tree<'info>(
 
     {
         let merkle_tree = ctx.accounts.merkle_tree.load_mut()?;
-        if merkle_tree.metadata.associated_queue != ctx.accounts.queue.key().into() {
+        if merkle_tree.metadata.associated_queue
+            != <anchor_lang::prelude::Pubkey as Into<light_compressed_account::pubkey::Pubkey>>::into(ctx.accounts.queue.key())
+        {
             msg!(
             "Merkle tree and nullifier queue are not associated. Merkle tree associated address queue {:?} != provided queue {}",
             merkle_tree.metadata.associated_queue,

programs/account-compression/src/instructions/update_address_merkle_tree.rs

@@ -138,7 +138,7 @@ fn process_address_v1<'info>(
             .map_err(ProgramError::from)?;
         let queue = bytemuck::from_bytes::<QueueAccount>(&queue_data[8..QueueAccount::LEN]);
         // 3. Check queue and Merkle tree are associated.
-        if queue.metadata.associated_merkle_tree != (*merkle_pubkey).into() {
+        if queue.metadata.associated_merkle_tree != <anchor_lang::prelude::Pubkey as Into<light_compressed_account::pubkey::Pubkey>>::into(*merkle_pubkey)  {
             msg!(
                 "Queue account {:?} is not associated with Merkle tree  {:?}",
                 address_queue.key(),

programs/account-compression/src/processor/insert_addresses.rs

@@ -1,6 +1,8 @@
 use anchor_lang::prelude::*;
 use light_batched_merkle_tree::queue::BatchedQueueAccount;
-use light_compressed_account::instruction_data::insert_into_queues::InsertNullifierInput;
+use light_compressed_account::{
+    instruction_data::insert_into_queues::InsertNullifierInput, pubkey::Pubkey,
+};
 use num_bigint::BigUint;
 
 use crate::{
@@ -177,7 +179,9 @@ fn process_nullifiers_v1<'info>(
         // Discriminator is already checked in try_from_account_infos.
         let queue = bytemuck::from_bytes::<QueueAccount>(&queue_data[8..QueueAccount::LEN]);
         // 3. Check queue and Merkle tree are associated.
-        if queue.metadata.associated_merkle_tree != (*merkle_pubkey).into() {
+        if queue.metadata.associated_merkle_tree
+            != <anchor_lang::prelude::Pubkey as Into<Pubkey>>::into(*merkle_pubkey)
+        {
             msg!(
                 "Queue account {:?} is not associated with Merkle tree  {:?}",
                 nullifier_queue.key(),

programs/account-compression/src/processor/insert_nullifiers.rs

@@ -28,6 +28,7 @@ light-system-program = { workspace = true, features = ["cpi"] }
 solana-security-txt = "1.1.0"
 light-merkle-tree-metadata = { workspace = true }
 light-batched-merkle-tree = { workspace = true }
+light-compressed-account = { workspace = true }
 [target.'cfg(not(target_os = "solana"))'.dependencies]
 solana-sdk = { workspace = true }
 

programs/registry/Cargo.toml

@@ -682,7 +682,11 @@ pub fn check_forester(
             return err!(RegistryError::InvalidNetworkFee);
         }
         Ok(())
-    } else if metadata.access_metadata.forester == authority.into() {
+    } else if metadata.access_metadata.forester
+        == <anchor_lang::prelude::Pubkey as Into<light_compressed_account::pubkey::Pubkey>>::into(
+            authority,
+        )
+    {
         Ok(())
     } else {
         err!(RegistryError::InvalidSigner)

programs/registry/src/lib.rs

@@ -182,7 +182,7 @@ pub async fn assert_address_merkle_tree_initialized<R: RpcConnection>(
 
     assert_eq!(
         merkle_tree_account.metadata.next_merkle_tree,
-        Pubkey::default().into()
+        light_compressed_account::pubkey::Pubkey::default()
     );
     let expected_access_meta_data = AccessMetadata {
         owner: (*owner_pubkey).into(),
@@ -195,7 +195,9 @@ pub async fn assert_address_merkle_tree_initialized<R: RpcConnection>(
     );
     assert_eq!(
         merkle_tree_account.metadata.associated_queue,
-        (*queue_pubkey).into()
+        <anchor_lang::prelude::Pubkey as Into<light_compressed_account::pubkey::Pubkey>>::into(
+            *queue_pubkey,
+        )
     );
 
     let merkle_tree = get_indexed_merkle_tree::<

sdk-libs/program-test/src/indexer/utils.rs

@@ -48,17 +48,16 @@ mod tests {
         LightAccountInfo {
             input: Some(LightInputAccountInfo {
                 lamports,
-
                 // None of the following values matter.
                 address: Some([1; 32]),
-                data_hash: Some([0; 32]),
+                data_hash: [0; 32],
                 merkle_context: PackedMerkleContext {
                     merkle_tree_pubkey_index: 0,
                     nullifier_queue_pubkey_index: 0,
                     leaf_index: 0,
                     prove_by_index: false,
                 },
-                root_index: 0,
+                root_index: Some(0),
             }),
             owner,
             // None of the following values matter.