fixes

tilo-14 · tilo-14 · commit 431bc9bf366c · 2026-01-27T14:53:59.000Z
diff --git a/program-examples/native-rust/Cargo.toml b/program-examples/native-rust/Cargo.toml
@@ -5,7 +5,7 @@ resolver = "2"
 [workspace.dependencies]
 # Pin to match light-protocol Cargo.lock
 constant_time_eq = "=0.3.1"
-blake3 = "=1.5.5"
+blake3 = "=1.8.2"
 
 [profile.release]
 overflow-checks = true
diff --git a/program-examples/native-rust/README.md b/program-examples/native-rust/README.md
@@ -1,31 +1,31 @@
 # Light Token Native Rust Solana Programs
 
+- **approve** - Approve delegate via CPI
+  - [Instruction](program/src/instructions/approve.rs) | [Test](program/tests/approve.rs)
+- **burn** - Burn tokens via CPI
+  - [Instruction](program/src/instructions/burn.rs) | [Test](program/tests/burn.rs)
+- **close** - Close token account via CPI
+  - [Instruction](program/src/instructions/close.rs) | [Test](program/tests/close.rs)
+- **create-associated** - Create an associated light-token account via CPI
+  - [Instruction](program/src/instructions/create_ata.rs) | [Test](program/tests/create_ata.rs)
 - **create-mint** - Create a light-token mint via CPI
   - [Instruction](program/src/instructions/create_mint.rs) | [Test](program/tests/create_mint.rs)
-- **create-ata** - Create an associated light-token account via CPI
-  - [Instruction](program/src/instructions/create_ata.rs) | [Test](program/tests/create_ata.rs)
 - **create-token-account** - Create a light-token account via CPI
   - [Instruction](program/src/instructions/create_token_account.rs) | [Test](program/tests/create_token_account.rs)
+- **freeze** - Freeze token account via CPI
+  - [Instruction](program/src/instructions/freeze.rs) | [Test](program/tests/freeze.rs)
 - **mint-to** - Mint tokens via CPI
   - [Instruction](program/src/instructions/mint_to.rs) | [Test](program/tests/mint_to.rs)
 - **mint-to-checked** - Mint tokens with decimal validation via CPI
   - [Instruction](program/src/instructions/mint_to_checked.rs) | [Test](program/tests/mint_to_checked.rs)
-- **transfer-interface** - Transfer between light-token, T22, and SPL accounts via CPI
-  - [Instruction](program/src/instructions/transfer_interface.rs) | [Test](program/tests/transfer.rs)
-- **transfer-checked** - Transfer with decimal validation against mint via CPI
-  - [Instruction](program/src/instructions/transfer_checked.rs) | [Test](program/tests/transfer_checked.rs)
-- **approve** - Approve delegate via CPI
-  - [Instruction](program/src/instructions/approve.rs) | [Test](program/tests/approve.rs)
 - **revoke** - Revoke delegate via CPI
   - [Instruction](program/src/instructions/revoke.rs) | [Test](program/tests/revoke.rs)
-- **burn** - Burn tokens via CPI
-  - [Instruction](program/src/instructions/burn.rs) | [Test](program/tests/burn.rs)
-- **freeze** - Freeze token account via CPI
-  - [Instruction](program/src/instructions/freeze.rs) | [Test](program/tests/freeze.rs)
 - **thaw** - Thaw token account via CPI
   - [Instruction](program/src/instructions/thaw.rs) | [Test](program/tests/thaw.rs)
-- **close** - Close token account via CPI
-  - [Instruction](program/src/instructions/close.rs) | [Test](program/tests/close.rs)
+- **transfer-checked** - Transfer with decimal validation against mint via CPI
+  - [Instruction](program/src/instructions/transfer_checked.rs) | [Test](program/tests/transfer_checked.rs)
+- **transfer-interface** - Transfer between light-token, T22, and SPL accounts via CPI
+  - [Instruction](program/src/instructions/transfer_interface.rs) | [Test](program/tests/transfer.rs)
 
 ## Build
 
diff --git a/program-examples/native-rust/program/Cargo.toml b/program-examples/native-rust/program/Cargo.toml
@@ -13,7 +13,6 @@ default = []
 
 [dependencies]
 light-token = "0.4.0"
-light-token-interface = "0.3.0"
 light-compressible = "0.4.0"
 solana-program = "2.2"
 borsh = "0.10.4"
diff --git a/program-examples/native-rust/program/src/instructions/burn.rs b/program-examples/native-rust/program/src/instructions/burn.rs
@@ -6,7 +6,8 @@ use solana_program::{
 };
 
 pub fn burn_invoke(accounts: &[AccountInfo], data: &[u8]) -> ProgramResult {
-    let [source, mint, authority, system_program, _token_program] = accounts else {
+    let [source, mint, authority, system_program, _token_program] = accounts
+    else {
         return Err(ProgramError::NotEnoughAccountKeys);
     };
 
@@ -32,7 +33,8 @@ pub fn burn_invoke_signed(
     accounts: &[AccountInfo],
     data: &[u8],
 ) -> ProgramResult {
-    let [source, mint, authority, system_program, _token_program] = accounts else {
+    let [source, mint, authority, system_program, _token_program] = accounts
+    else {
         return Err(ProgramError::NotEnoughAccountKeys);
     };
 
diff --git a/program-examples/native-rust/program/src/instructions/close.rs b/program-examples/native-rust/program/src/instructions/close.rs
@@ -11,7 +11,7 @@ pub fn close_invoke(accounts: &[AccountInfo], _data: &[u8]) -> ProgramResult {
         return Err(ProgramError::NotEnoughAccountKeys);
     };
 
-    // Close token account. Must be empty (balance = 0)
+    // Close token account. Must be empty (balance == 0)
     CloseAccountCpi {
         token_program: token_program.clone(),
         account: account.clone(),
diff --git a/program-examples/native-rust/program/src/instructions/create_mint.rs b/program-examples/native-rust/program/src/instructions/create_mint.rs
@@ -4,8 +4,8 @@ use light_compressible::CreateAccountsProof;
 use light_token::instruction::{
     CreateMintCpi, CreateMintParams, SystemAccountInfos,
 };
-use light_token_interface::instructions::extensions::{
-    token_metadata::TokenMetadataInstructionData, ExtensionInstructionData,
+use light_token::instruction::{
+    ExtensionInstructionData, TokenMetadataInstructionData,
 };
 use solana_program::{
     account_info::AccountInfo, entrypoint::ProgramResult,
@@ -32,23 +32,8 @@ pub fn create_mint_invoke(
     accounts: &[AccountInfo],
     data: &[u8],
 ) -> ProgramResult {
-    let [
-        mint_seed,
-        authority,
-        payer,
-        address_tree,
-        output_queue,
-        compressible_config,
-        mint,
-        rent_sponsor,
-        light_system_program,
-        cpi_authority_pda,
-        registered_program_pda,
-        account_compression_authority,
-        account_compression_program,
-        system_program,
-        _token_program,
-    ] = accounts
+    let [mint_seed, authority, payer, address_tree, output_queue, compressible_config, mint, rent_sponsor, light_system_program, cpi_authority_pda, registered_program_pda, account_compression_authority, account_compression_program, system_program, _token_program] =
+        accounts
     else {
         return Err(ProgramError::NotEnoughAccountKeys);
     };
@@ -140,23 +125,8 @@ pub fn create_mint_invoke_signed(
     accounts: &[AccountInfo],
     data: &[u8],
 ) -> ProgramResult {
-    let [
-        mint_seed,
-        authority,
-        payer,
-        address_tree,
-        output_queue,
-        compressible_config,
-        mint,
-        rent_sponsor,
-        light_system_program,
-        cpi_authority_pda,
-        registered_program_pda,
-        account_compression_authority,
-        account_compression_program,
-        system_program,
-        _token_program,
-    ] = accounts
+    let [mint_seed, authority, payer, address_tree, output_queue, compressible_config, mint, rent_sponsor, light_system_program, cpi_authority_pda, registered_program_pda, account_compression_authority, account_compression_program, system_program, _token_program] =
+        accounts
     else {
         return Err(ProgramError::NotEnoughAccountKeys);
     };
diff --git a/program-examples/native-rust/program/src/instructions/mint_to_checked.rs b/program-examples/native-rust/program/src/instructions/mint_to_checked.rs
@@ -5,7 +5,10 @@ use solana_program::{
     program_error::ProgramError,
 };
 
-pub fn mint_to_checked_invoke(accounts: &[AccountInfo], data: &[u8]) -> ProgramResult {
+pub fn mint_to_checked_invoke(
+    accounts: &[AccountInfo],
+    data: &[u8],
+) -> ProgramResult {
     let [mint, destination, authority, system_program, _token_program] =
         accounts
     else {
diff --git a/program-examples/native-rust/program/src/instructions/transfer_checked.rs b/program-examples/native-rust/program/src/instructions/transfer_checked.rs
@@ -5,7 +5,10 @@ use solana_program::{
     program_error::ProgramError,
 };
 
-pub fn transfer_checked_invoke(accounts: &[AccountInfo], data: &[u8]) -> ProgramResult {
+pub fn transfer_checked_invoke(
+    accounts: &[AccountInfo],
+    data: &[u8],
+) -> ProgramResult {
     let [source, mint, destination, authority, system_program, _token_program] =
         accounts
     else {
diff --git a/program-examples/native-rust/program/tests/approve.rs b/program-examples/native-rust/program/tests/approve.rs
@@ -5,8 +5,7 @@ use light_client::rpc::Rpc;
 use light_token_interface::state::Token;
 use shared::{
     build_approve_cpi_ix, build_approve_signed_cpi_ix, create_test_rpc,
-    get_authority_pda, setup, setup_empty_ata, setup_pda_owned_ata,
-    SetupContext,
+    get_authority_pda, setup, setup_pda_owned_ata, SetupContext,
 };
 use solana_sdk::{signature::Keypair, signer::Signer};
 
diff --git a/program-examples/native-rust/program/tests/create_mint.rs b/program-examples/native-rust/program/tests/create_mint.rs
@@ -5,10 +5,10 @@ use light_client::{
     indexer::{AddressWithTree, Indexer},
     rpc::Rpc,
 };
-use light_compressible::CreateAccountsProof;
 use light_compressed_account::instruction_data::{
     compressed_proof::ValidityProof, data::PackedAddressTreeInfo,
 };
+use light_compressible::CreateAccountsProof;
 use light_token::instruction::{
     config_pda, derive_mint_compressed_address, find_mint_address,
     rent_sponsor_pda, SystemAccounts, LIGHT_TOKEN_PROGRAM_ID,
diff --git a/program-examples/native-rust/program/tests/freeze.rs b/program-examples/native-rust/program/tests/freeze.rs
@@ -41,7 +41,7 @@ async fn freeze_signed_cpi() {
     let initial_amount = 1_000_000u64;
 
     // Create mint with PDA as freeze authority and mint tokens to payer
-    let (mint, atas) = setup_mint_with_tokens(
+    let (mint, associated_token_accounts) = setup_mint_with_tokens(
         &mut rpc,
         &payer,
         payer.pubkey(),
@@ -51,7 +51,7 @@ async fn freeze_signed_cpi() {
     )
     .await;
 
-    let ata = atas[0];
+    let ata = associated_token_accounts[0];
 
     let ix = build_freeze_signed_cpi_ix(ata, mint, pda_authority, bump);
 
diff --git a/program-examples/native-rust/program/tests/mint_to_checked.rs b/program-examples/native-rust/program/tests/mint_to_checked.rs
@@ -3,8 +3,8 @@ mod shared;
 use light_client::rpc::Rpc;
 use shared::{
     build_mint_to_checked_cpi_ix, build_mint_to_checked_signed_cpi_ix,
-    create_test_rpc, get_authority_pda, setup_mint_with_pda_authority,
-    setup_mint_with_tokens, create_ata,
+    create_ata, create_test_rpc, get_authority_pda,
+    setup_mint_with_pda_authority, setup_mint_with_tokens,
 };
 use solana_sdk::{signature::Keypair, signer::Signer};
 
@@ -13,7 +13,7 @@ async fn mint_to_checked_cpi() {
     let mut rpc = create_test_rpc().await;
     let payer = rpc.get_payer().insecure_clone();
 
-    let (mint, atas) = setup_mint_with_tokens(
+    let (mint, associated_token_accounts) = setup_mint_with_tokens(
         &mut rpc,
         &payer,
         payer.pubkey(),
@@ -27,7 +27,7 @@ async fn mint_to_checked_cpi() {
 
     let ix = build_mint_to_checked_cpi_ix(
         mint,
-        atas[0],
+        associated_token_accounts[0],
         payer.pubkey(),
         mint_amount,
         9,
@@ -45,10 +45,12 @@ async fn mint_to_checked_signed_cpi() {
 
     let (pda_authority, bump) = get_authority_pda();
 
-    let mint = setup_mint_with_pda_authority(&mut rpc, &payer, pda_authority, 9).await;
+    let mint =
+        setup_mint_with_pda_authority(&mut rpc, &payer, pda_authority, 9).await;
 
     let recipient = Keypair::new();
-    let recipient_ata = create_ata(&mut rpc, &payer, recipient.pubkey(), mint).await;
+    let recipient_ata =
+        create_ata(&mut rpc, &payer, recipient.pubkey(), mint).await;
 
     let mint_amount = 1_000_000u64;
 
diff --git a/program-examples/native-rust/program/tests/shared.rs b/program-examples/native-rust/program/tests/shared.rs
@@ -3,15 +3,16 @@ use light_client::{
     indexer::{AddressWithTree, Indexer},
     rpc::Rpc,
 };
-use light_compressible::CreateAccountsProof;
 use light_compressed_account::instruction_data::{
     compressed_proof::ValidityProof, data::PackedAddressTreeInfo,
 };
+use light_compressible::CreateAccountsProof;
 use light_program_test::{LightProgramTest, ProgramTestConfig};
 use light_token::instruction::{
-    derive_mint_compressed_address, derive_token_ata, find_mint_address, Approve,
-    CreateAssociatedTokenAccount, CreateMint, CreateMintParams, Freeze, MintTo,
-    SystemAccounts, COMPRESSIBLE_CONFIG_V1, LIGHT_TOKEN_PROGRAM_ID, RENT_SPONSOR,
+    derive_mint_compressed_address, derive_token_ata, find_mint_address,
+    Approve, CreateAssociatedTokenAccount, CreateMint, CreateMintParams,
+    Freeze, MintTo, SystemAccounts, COMPRESSIBLE_CONFIG_V1,
+    LIGHT_TOKEN_PROGRAM_ID, RENT_SPONSOR,
 };
 #[allow(deprecated)]
 use solana_sdk::{
@@ -59,7 +60,7 @@ pub async fn setup() -> SetupContext {
     let payer = rpc.get_payer().insecure_clone();
     let initial_amount = 1_000_000u64;
 
-    let (mint, atas) = setup_mint_with_tokens(
+    let (mint, associated_token_accounts) = setup_mint_with_tokens(
         &mut rpc,
         &payer,
         payer.pubkey(),
@@ -69,7 +70,7 @@ pub async fn setup() -> SetupContext {
     )
     .await;
 
-    let ata = atas[0];
+    let ata = associated_token_accounts[0];
     let delegate = Keypair::new();
 
     let approve_ix = Approve {
@@ -100,7 +101,7 @@ pub async fn setup_empty_ata() -> SetupContext {
 
     let payer = rpc.get_payer().insecure_clone();
 
-    let (mint, atas) = setup_mint_with_tokens(
+    let (mint, associated_token_accounts) = setup_mint_with_tokens(
         &mut rpc,
         &payer,
         payer.pubkey(),
@@ -116,7 +117,7 @@ pub async fn setup_empty_ata() -> SetupContext {
         rpc,
         payer,
         mint,
-        ata: atas[0],
+        ata: associated_token_accounts[0],
         delegate,
     }
 }
@@ -128,7 +129,7 @@ pub async fn setup_frozen() -> SetupContext {
     let payer = rpc.get_payer().insecure_clone();
     let initial_amount = 1_000_000u64;
 
-    let (mint, atas) = setup_mint_with_tokens(
+    let (mint, associated_token_accounts) = setup_mint_with_tokens(
         &mut rpc,
         &payer,
         payer.pubkey(),
@@ -138,7 +139,7 @@ pub async fn setup_frozen() -> SetupContext {
     )
     .await;
 
-    let ata = atas[0];
+    let ata = associated_token_accounts[0];
     let delegate = Keypair::new();
 
     let approve_ix = Approve {
@@ -715,11 +716,23 @@ pub async fn setup_mint_with_pda_authority(
             AccountMeta::new_readonly(COMPRESSIBLE_CONFIG_V1, false),
             AccountMeta::new(mint, false),
             AccountMeta::new(RENT_SPONSOR, false),
-            AccountMeta::new_readonly(system_accounts.light_system_program, false),
+            AccountMeta::new_readonly(
+                system_accounts.light_system_program,
+                false,
+            ),
             AccountMeta::new_readonly(system_accounts.cpi_authority_pda, false),
-            AccountMeta::new_readonly(system_accounts.registered_program_pda, false),
-            AccountMeta::new_readonly(system_accounts.account_compression_authority, false),
-            AccountMeta::new_readonly(system_accounts.account_compression_program, false),
+            AccountMeta::new_readonly(
+                system_accounts.registered_program_pda,
+                false,
+            ),
+            AccountMeta::new_readonly(
+                system_accounts.account_compression_authority,
+                false,
+            ),
+            AccountMeta::new_readonly(
+                system_accounts.account_compression_program,
+                false,
+            ),
             AccountMeta::new_readonly(system_accounts.system_program, false),
             AccountMeta::new_readonly(LIGHT_TOKEN_PROGRAM_ID, false),
         ],
