chore: bump anchor to v0.32.1

Cargo.toml

@@ -121,8 +121,8 @@ 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.32.0" }
+anchor-spl = "0.32.0"
 
 # Anchor compatibility
 borsh = "0.10.0"
@@ -247,3 +247,8 @@ solana-bpf-loader-program = { git = "https://github.com/Lightprotocol/agave", re
 # Patch solana-program-memory to use older version where is_nonoverlapping is public
 solana-program-memory = { git = "https://github.com/anza-xyz/solana-sdk", rev = "1c1d667f161666f12f5a43ebef8eda9470a8c6ee" }
 litesvm = { git = "https://github.com/Lightprotocol/litesvm", rev = "a04cb80b6847eb720c840a5e5d9a6f74ce630cc6" }
+# Fix anchor-syn 0.32.1 local_file() error with proc_macro2
+# Using latest master with the fix merged
+anchor-lang = { git = "https://github.com/solana-foundation/anchor", branch = "master" }
+anchor-syn = { git = "https://github.com/solana-foundation/anchor", branch = "master" }
+anchor-spl = { git = "https://github.com/solana-foundation/anchor", branch = "master" }

js/stateless.js/src/rpc.ts

@@ -1590,7 +1590,6 @@ export class Rpc extends Connection implements CompressionApiInterface {
         const timeout = isLocalTest(this.rpcEndpoint) ? 10000 : 20000;
         const interval = isLocalTest(this.rpcEndpoint) ? 100 : 200;
         const startTime = Date.now();
-        // eslint-disable-next-line no-constant-condition
         while (true) {
             const indexerSlot = await this.getIndexerSlot();
 

program-tests/create-address-test-program/src/create_pda.rs

@@ -74,7 +74,7 @@ fn cpi_compressed_pda_transfer_as_program<'info>(
     let signer_seeds: [&[&[u8]]; 1] = [&seeds[..]];
 
     let mut cpi_ctx = CpiContext::new_with_signer(
-        ctx.accounts.light_system_program.to_account_info(),
+        *ctx.accounts.light_system_program.to_account_info().key,
         cpi_accounts,
         &signer_seeds,
     );

program-tests/create-address-test-program/src/lib.rs

@@ -139,7 +139,6 @@ pub fn process_invoke_cpi<'info>(
     inputs: Vec<u8>,
     bump: u8,
 ) -> Result<()> {
-    anchor_lang::solana_program::log::sol_log_compute_units();
     let cpi_accounts = light_system_program::cpi::accounts::InvokeCpiInstruction {
         fee_payer: ctx.accounts.signer.to_account_info(),
         authority: ctx.accounts.cpi_signer.to_account_info(),
@@ -175,8 +174,6 @@ pub fn process_invoke_cpi<'info>(
         data: inputs,
     };
 
-    anchor_lang::solana_program::log::sol_log_compute_units();
-
     // Invoke the instruction with signer seeds
     anchor_lang::solana_program::program::invoke_signed(
         &instruction,

program-tests/system-cpi-test/src/create_pda.rs

@@ -220,7 +220,7 @@ fn cpi_compressed_pda_transfer_as_non_program<'info>(
         cpi_context_account: None,
     };
     let mut cpi_ctx = CpiContext::new(
-        ctx.accounts.light_system_program.to_account_info(),
+        *ctx.accounts.light_system_program.to_account_info().key,
         cpi_accounts,
     );
 
@@ -429,7 +429,7 @@ fn cpi_compressed_pda_transfer_as_program<'info>(
         let signer_seeds: [&[&[u8]]; 1] = [&seeds[..]];
 
         let mut cpi_ctx = CpiContext::new_with_signer(
-            ctx.accounts.light_system_program.to_account_info(),
+            *ctx.accounts.light_system_program.to_account_info().key,
             cpi_accounts,
             &signer_seeds,
         );
@@ -458,7 +458,7 @@ fn cpi_compressed_pda_transfer_as_program<'info>(
         let signer_seeds: [&[&[u8]]; 1] = [&seeds[..]];
 
         let mut cpi_ctx = CpiContext::new_with_signer(
-            ctx.accounts.light_system_program.to_account_info(),
+            *ctx.accounts.light_system_program.to_account_info().key,
             cpi_accounts,
             &signer_seeds,
         );

program-tests/system-cpi-test/src/invalidate_not_owned_account.rs

@@ -174,7 +174,7 @@ pub fn process_invalidate_not_owned_compressed_account<'info>(
     let signer_seeds: [&[&[u8]]; 1] = [&seeds[..]];
 
     let mut cpi_ctx = CpiContext::new_with_signer(
-        ctx.accounts.light_system_program.to_account_info(),
+        *ctx.accounts.light_system_program.to_account_info().key,
         cpi_accounts,
         &signer_seeds,
     );
@@ -361,7 +361,7 @@ pub fn cpi_compressed_token_transfer<'info>(
     };
 
     let mut cpi_ctx = CpiContext::new(
-        ctx.accounts.compressed_token_program.to_account_info(),
+        *ctx.accounts.compressed_token_program.to_account_info().key,
         cpi_accounts,
     );
 
@@ -442,7 +442,7 @@ pub fn cpi_compressed_token_approve_revoke<'info>(
     };
 
     let mut cpi_ctx = CpiContext::new(
-        ctx.accounts.compressed_token_program.to_account_info(),
+        *ctx.accounts.compressed_token_program.to_account_info().key,
         cpi_accounts,
     );
 
@@ -509,7 +509,7 @@ pub fn cpi_compressed_token_burn<'info>(
     };
 
     let mut cpi_ctx = CpiContext::new(
-        ctx.accounts.compressed_token_program.to_account_info(),
+        *ctx.accounts.compressed_token_program.to_account_info().key,
         cpi_accounts,
     );
 
@@ -583,7 +583,7 @@ pub fn cpi_compressed_token_freeze_or_thaw<'info>(
     };
 
     let mut cpi_ctx = CpiContext::new(
-        ctx.accounts.compressed_token_program.to_account_info(),
+        *ctx.accounts.compressed_token_program.to_account_info().key,
         cpi_accounts,
     );
 
@@ -654,7 +654,7 @@ fn write_into_cpi_account<'info>(
     let signer_seeds: [&[&[u8]]; 1] = [&seeds[..]];
 
     let mut cpi_ctx = CpiContext::new_with_signer(
-        ctx.accounts.light_system_program.to_account_info(),
+        *ctx.accounts.light_system_program.to_account_info().key,
         cpi_accounts,
         &signer_seeds,
     );

program-tests/system-cpi-test/src/lib.rs

@@ -99,7 +99,10 @@ pub mod system_cpi_test {
         let bump = &[bump];
         let seeds = [&[CPI_AUTHORITY_PDA_SEED, bump][..]];
         let mut cpi_context = CpiContext::new_with_signer(
-            ctx.accounts.account_compression_program.to_account_info(),
+            *ctx.accounts
+                .account_compression_program
+                .to_account_info()
+                .key,
             accounts,
             &seeds,
         );
@@ -158,7 +161,10 @@ pub mod system_cpi_test {
             registered_program_pda: Some(ctx.accounts.registered_program_pda.clone()),
         };
         let cpi_ctx = CpiContext::new_with_signer(
-            ctx.accounts.account_compression_program.to_account_info(),
+            *ctx.accounts
+                .account_compression_program
+                .to_account_info()
+                .key,
             accounts,
             signer_seeds,
         );
@@ -194,7 +200,10 @@ pub mod system_cpi_test {
                 registered_program_pda: Some(ctx.accounts.registered_program_pda.clone()),
             };
         let cpi_ctx = CpiContext::new_with_signer(
-            ctx.accounts.account_compression_program.to_account_info(),
+            *ctx.accounts
+                .account_compression_program
+                .to_account_info()
+                .key,
             accounts,
             signer_seeds,
         );

program-tests/utils/Cargo.toml

@@ -18,6 +18,7 @@ anchor-spl = { workspace = true }
 num-bigint = { workspace = true, features = ["rand"] }
 num-traits = { workspace = true }
 solana-sdk = { workspace = true }
+solana-program = { workspace = true }
 thiserror = { workspace = true }
 account-compression = { workspace = true, features = ["cpi"] }
 light-compressed-token = { workspace = true, features = ["cpi"] }

program-tests/utils/src/assert_ctoken_transfer.rs

@@ -1,8 +1,9 @@
-use anchor_spl::token_2022::spl_token_2022::{self, solana_program::program_pack::Pack};
+use anchor_spl::token_2022::spl_token_2022;
 use light_client::rpc::Rpc;
 use light_ctoken_types::state::CToken;
 use light_program_test::LightProgramTest;
 use light_zero_copy::traits::ZeroCopyAt;
+use solana_program::program_pack::Pack;
 use solana_sdk::pubkey::Pubkey;
 
 /// Assert compressible extension properties for an account, using cached pre-transaction state

programs/compressed-token/anchor/src/burn.rs

@@ -101,7 +101,7 @@ pub fn spl_burn_cpi<'info>(
     };
     let signer_seeds = get_cpi_signer_seeds();
     let signer_seeds_ref = &[&signer_seeds[..]];
-    let cpi_ctx = CpiContext::new_with_signer(token_program, cpi_accounts, signer_seeds_ref);
+    let cpi_ctx = CpiContext::new_with_signer(*token_program.key, cpi_accounts, signer_seeds_ref);
     anchor_spl::token_interface::burn(cpi_ctx, burn_amount)?;
     let post_token_balance =
         TokenAccount::try_deserialize(&mut &token_pool_pda.data.borrow()[..])?.amount;

programs/compressed-token/anchor/src/process_mint.rs

@@ -335,7 +335,10 @@ pub fn mint_spl_to_pool_pda(
         authority: ctx.accounts.authority.to_account_info(),
     };
 
-    let cpi_ctx = CpiContext::new(ctx.accounts.token_program.to_account_info(), cpi_accounts);
+    let cpi_ctx = CpiContext::new(
+        *ctx.accounts.token_program.to_account_info().key,
+        cpi_accounts,
+    );
     anchor_spl::token_interface::mint_to(cpi_ctx, mint_amount)?;
 
     let post_token_balance = TokenAccount::try_deserialize(

programs/compressed-token/anchor/src/process_transfer.rs

@@ -467,7 +467,7 @@ pub fn cpi_execute_compressed_transaction_transfer<
             cpi_context_account,
         };
         let mut cpi_ctx = CpiContext::new_with_signer(
-            _system_program_account_info,
+            *_system_program_account_info.key,
             cpi_accounts,
             signer_seeds_ref,
         );

programs/compressed-token/anchor/src/spl_compression.rs

@@ -234,7 +234,7 @@ pub fn spl_token_transfer_cpi_with_signer<'info>(
         to,
         authority,
     };
-    let cpi_ctx = CpiContext::new_with_signer(token_program, accounts, signer_seeds_ref);
+    let cpi_ctx = CpiContext::new_with_signer(*token_program.key, accounts, signer_seeds_ref);
     anchor_spl::token_interface::transfer(cpi_ctx, amount)
 }
 

programs/registry/Cargo.toml

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

programs/registry/src/account_compression_cpi/batch_append.rs

@@ -38,7 +38,10 @@ pub fn process_batch_append(ctx: &Context<BatchAppend>, bump: u8, data: Vec<u8>)
     };
 
     let cpi_ctx = CpiContext::new_with_signer(
-        ctx.accounts.account_compression_program.to_account_info(),
+        *ctx.accounts
+            .account_compression_program
+            .to_account_info()
+            .key,
         accounts,
         signer_seeds,
     );

programs/registry/src/account_compression_cpi/batch_nullify.rs

@@ -34,7 +34,10 @@ pub fn process_batch_nullify(ctx: &Context<BatchNullify>, bump: u8, data: Vec<u8
     };
 
     let cpi_ctx = CpiContext::new_with_signer(
-        ctx.accounts.account_compression_program.to_account_info(),
+        *ctx.accounts
+            .account_compression_program
+            .to_account_info()
+            .key,
         accounts,
         signer_seeds,
     );

programs/registry/src/account_compression_cpi/batch_update_address_tree.rs

@@ -38,7 +38,10 @@ pub fn process_batch_update_address_tree(
     };
 
     let cpi_ctx = CpiContext::new_with_signer(
-        ctx.accounts.account_compression_program.to_account_info(),
+        *ctx.accounts
+            .account_compression_program
+            .to_account_info()
+            .key,
         accounts,
         signer_seeds,
     );

programs/registry/src/account_compression_cpi/initialize_batched_address_tree.rs

@@ -34,7 +34,10 @@ pub fn process_initialize_batched_address_merkle_tree(
     };
 
     let cpi_ctx = CpiContext::new_with_signer(
-        ctx.accounts.account_compression_program.to_account_info(),
+        *ctx.accounts
+            .account_compression_program
+            .to_account_info()
+            .key,
         accounts,
         signer_seeds,
     );

programs/registry/src/account_compression_cpi/initialize_batched_state_tree.rs

@@ -43,7 +43,10 @@ pub fn process_initialize_batched_state_merkle_tree(
     };
 
     let cpi_ctx = CpiContext::new_with_signer(
-        ctx.accounts.account_compression_program.to_account_info(),
+        *ctx.accounts
+            .account_compression_program
+            .to_account_info()
+            .key,
         accounts,
         signer_seeds,
     );

programs/registry/src/account_compression_cpi/initialize_tree_and_queue.rs

@@ -52,7 +52,10 @@ pub fn process_initialize_state_merkle_tree(
         registered_program_pda: Some(ctx.accounts.registered_program_pda.clone()),
     };
     let cpi_ctx = CpiContext::new_with_signer(
-        ctx.accounts.account_compression_program.to_account_info(),
+        *ctx.accounts
+            .account_compression_program
+            .to_account_info()
+            .key,
         accounts,
         signer_seeds,
     );
@@ -87,7 +90,10 @@ pub fn process_initialize_address_merkle_tree(
         registered_program_pda: Some(ctx.accounts.registered_program_pda.clone()),
     };
     let cpi_ctx = CpiContext::new_with_signer(
-        ctx.accounts.account_compression_program.to_account_info(),
+        *ctx.accounts
+            .account_compression_program
+            .to_account_info()
+            .key,
         accounts,
         signer_seeds,
     );
@@ -117,7 +123,7 @@ pub fn process_initialize_cpi_context<'info>(
         cpi_context_account,
         associated_merkle_tree,
     };
-    let cpi_ctx = CpiContext::new_with_signer(light_system_program, accounts, signer_seeds);
+    let cpi_ctx = CpiContext::new_with_signer(*light_system_program.key, accounts, signer_seeds);
 
     light_system_program::cpi::init_cpi_context_account(cpi_ctx)
 }

programs/registry/src/account_compression_cpi/migrate_state.rs

@@ -43,7 +43,10 @@ pub fn process_migrate_state(
         output_queue: ctx.accounts.output_queue.to_account_info(),
     };
     let cpi_ctx = CpiContext::new_with_signer(
-        ctx.accounts.account_compression_program.to_account_info(),
+        *ctx.accounts
+            .account_compression_program
+            .to_account_info()
+            .key,
         accounts,
         signer_seeds,
     );

programs/registry/src/account_compression_cpi/nullify.rs

@@ -46,7 +46,10 @@ pub fn process_nullify(
         nullifier_queue: ctx.accounts.nullifier_queue.to_account_info(),
     };
     let cpi_ctx = CpiContext::new_with_signer(
-        ctx.accounts.account_compression_program.to_account_info(),
+        *ctx.accounts
+            .account_compression_program
+            .to_account_info()
+            .key,
         accounts,
         signer_seeds,
     );

programs/registry/src/account_compression_cpi/rollover_batched_address_tree.rs

@@ -42,7 +42,10 @@ pub fn process_rollover_batched_address_merkle_tree(
     };
 
     let cpi_ctx = CpiContext::new_with_signer(
-        ctx.accounts.account_compression_program.to_account_info(),
+        *ctx.accounts
+            .account_compression_program
+            .to_account_info()
+            .key,
         accounts,
         signer_seeds,
     );

programs/registry/src/account_compression_cpi/rollover_batched_state_tree.rs

@@ -54,7 +54,10 @@ pub fn process_rollover_batched_state_merkle_tree(
     };
 
     let cpi_ctx = CpiContext::new_with_signer(
-        ctx.accounts.account_compression_program.to_account_info(),
+        *ctx.accounts
+            .account_compression_program
+            .to_account_info()
+            .key,
         accounts,
         signer_seeds,
     );