chore: refactor macros

.cargo/config.toml

@@ -1,6 +1,9 @@
 [alias]
 xtask = "run --package xtask --"
 
+[resolver]
+incompatible-rust-versions = "fallback"
+
 # On Windows
 # ```
 # cargo install -f cargo-binutils

Cargo.toml

@@ -55,9 +55,7 @@ members = [
     "sdk-tests/sdk-native-test",
     "sdk-tests/sdk-v1-native-test",
     "sdk-tests/sdk-token-test",
-    "sdk-tests/sdk-compressible-test",
     "sdk-tests/sdk-light-token-test",
-    "sdk-tests/csdk-anchor-derived-test",
     "sdk-tests/csdk-anchor-full-derived-test",
     "forester-utils",
     "forester",

ctoken_for_payments.md

@@ -76,7 +76,7 @@ import {
   createAssociatedTokenAccountInterfaceIdempotentInstruction,
   getAssociatedTokenAddressInterface,
 } from "@lightprotocol/compressed-token/unified";
-import { CTOKEN_PROGRAM_ID } from "@lightprotocol/stateless.js";
+import { LIGHT_TOKEN_PROGRAM_ID } from "@lightprotocol/stateless.js";
 
 const ata = getAssociatedTokenAddressInterface(mint, recipient);
 
@@ -86,7 +86,7 @@ const tx = new Transaction().add(
     ata,
     recipient,
     mint,
-    CTOKEN_PROGRAM_ID
+    LIGHT_TOKEN_PROGRAM_ID
   )
 );
 ```
@@ -203,15 +203,15 @@ import {
   getAssociatedTokenAddressInterface,
   createAssociatedTokenAccountInterfaceIdempotentInstruction,
 } from "@lightprotocol/compressed-token/unified";
-import { CTOKEN_PROGRAM_ID } from "@lightprotocol/stateless.js";
+import { LIGHT_TOKEN_PROGRAM_ID } from "@lightprotocol/stateless.js";
 
 const destinationAta = getAssociatedTokenAddressInterface(mint, recipient);
 const createAtaIx = createAssociatedTokenAccountInterfaceIdempotentInstruction(
   payer.publicKey,
   destinationAta,
   recipient,
   mint,
-  CTOKEN_PROGRAM_ID
+  LIGHT_TOKEN_PROGRAM_ID
 );
 
 new Transaction().add(createAtaIx, transferIx);

program-libs/compressible/Cargo.toml

@@ -8,7 +8,7 @@ license = "MIT"
 [features]
 default = ["solana"]
 solana = ["dep:solana-program-error", "light-compressed-account/solana", "light-account-checks/solana", "solana-sysvar", "solana-msg"]
-anchor = ["anchor-lang", "light-compressed-account/anchor", "light-compressed-account/std", "light-account-checks/solana"]
+anchor = ["anchor-lang", "light-compressed-account/anchor", "light-compressed-account/std", "light-account-checks/solana", "light-sdk-types/anchor"]
 pinocchio = ["dep:pinocchio", "light-compressed-account/pinocchio", "light-account-checks/pinocchio"]
 profile-program = []
 profile-heap = ["dep:light-heap"]
@@ -32,6 +32,7 @@ light-program-profiler = { workspace = true }
 light-heap = { workspace = true, optional = true }
 light-account-checks = { workspace= true }
 light-compressed-account = { workspace= true }
+light-sdk-types = { workspace = true }
 aligned-sized = { workspace= true }
 solana-sysvar = {workspace = true, optional = true}
 

program-libs/compressible/src/lib.rs

@@ -8,3 +8,18 @@ pub mod rent;
 use anchor_lang::{AnchorDeserialize, AnchorSerialize};
 #[cfg(not(feature = "anchor"))]
 use borsh::{BorshDeserialize as AnchorDeserialize, BorshSerialize as AnchorSerialize};
+use light_compressed_account::instruction_data::compressed_proof::ValidityProof;
+use light_sdk_types::instruction::PackedAddressTreeInfo;
+
+/// Proof data for instruction params when creating new compressed accounts.
+/// Used in the INIT flow - pass directly to instruction data.
+/// All accounts use the same address tree, so only one `address_tree_info` is needed.
+#[derive(AnchorSerialize, AnchorDeserialize, Clone, Debug)]
+pub struct CreateAccountsProof {
+    /// The validity proof.
+    pub proof: ValidityProof,
+    /// Single packed address tree info (all accounts use same tree).
+    pub address_tree_info: PackedAddressTreeInfo,
+    /// Output state tree index for new compressed accounts.
+    pub output_state_tree_index: u8,
+}

programs/compressed-token/program/docs/ACCOUNTS.md

@@ -1,4 +1,5 @@
 # Accounts
+
 - Compressed tokens can be decompressed to spl tokens. Spl tokens are not explicitly listed here.
 - **description**
 - **discriminator**
@@ -8,11 +9,12 @@
 - **derivation:** (only for pdas)
 - **associated instructions** (create, close, update)
 
-
 ## Solana Accounts
+
 - The compressed token program uses
 
 ### CToken
+
 - **description**
   struct `CToken`
   ctoken solana account with spl token compatible state layout
@@ -40,93 +42,104 @@
 - **serialization example**
   borsh and zero copy deserialization deserialize the compressible extension, spl serialization only deserialize the base token data.
   zero copy: (always use in programs)
+
   ```rust
-  use light_token_interface::state::ctoken::CToken;
+  use light_token_interface::state::token::CToken;
   use light_zero_copy::traits::{ZeroCopyAt, ZeroCopyAtMut};
 
   let (token, _) = CToken::zero_copy_at(&account_data)?;
   let (mut token, _) = CToken::zero_copy_at_mut(&mut account_data)?;
   ```
 
   borsh: (always use in client non solana program code)
+
   ```rust
   use borsh::BorshDeserialize;
-  use light_token_interface::state::ctoken::CToken;
+  use light_token_interface::state::token::CToken;
 
   let token = CToken::deserialize(&mut &account_data[..])?;
   ```
 
   spl serialization: (preferably use other serialization)
+
   ```rust
   use spl_pod::bytemuck::pod_from_bytes;
   use spl_token_2022::pod::PodAccount;
 
   let pod_account = pod_from_bytes::<PodAccount>(&account_data[..165])?;
   ```
 
-
 ### Associated CToken
+
 - **description**
   struct `CToken`
   ctoken solana account with spl token compatible state layout
 - **derivation:**
-  seeds: [owner, ctoken_program_id, mint]
+  seeds: [owner, light_token_program_id, mint]
 - the same as `CToken`
 
-
 ### Compressible Config
+
 - owned by the LightRegistry program
 - defined in path `program-libs/compressible/src/config.rs`
 - crate: `light-compressible`
 
-
 ## Compressed Accounts
 
 ### Compressed Token
+
 - compressed token account.
 - version describes the hashing and the discriminator. (program-libs/token-interface/src/state/compressed_token/token_data_version.rs)
-    pub enum TokenDataVersion {
-        V1 = 1u8, // discriminator [2, 0, 0, 0, 0, 0, 0, 0], // 2 le (Poseidon hashed)
-        V2 = 2u8, // discriminator [0, 0, 0, 0, 0, 0, 0, 3], // 3 be (Poseidon hashed)
-        ShaFlat = 3u8, // discriminator [0, 0, 0, 0, 0, 0, 0, 4], // 4 be (Sha256 hash of borsh serialized data truncated to 31 bytes so that hash is less than be bn254 field size)
-    }
+  pub enum TokenDataVersion {
+  V1 = 1u8, // discriminator [2, 0, 0, 0, 0, 0, 0, 0], // 2 le (Poseidon hashed)
+  V2 = 2u8, // discriminator [0, 0, 0, 0, 0, 0, 0, 3], // 3 be (Poseidon hashed)
+  ShaFlat = 3u8, // discriminator [0, 0, 0, 0, 0, 0, 0, 4], // 4 be (Sha256 hash of borsh serialized data truncated to 31 bytes so that hash is less than be bn254 field size)
+  }
 
 ### Compressed Mint
 
 ## Extensions
+
 The compressed token program supports multiple extensions defined in `program-libs/token-interface/src/state/extensions/`.
 
 ### Mint Extensions
 
 #### TokenMetadata
+
 - Mint extension, compatible with TokenMetadata extension of Token2022.
 - Only available in compressed mints.
 - Path: `program-libs/token-interface/src/state/extensions/token_metadata.rs`
 
 ### Token Account Extensions
 
 #### Compressible
+
 - Token account extension, Token2022 does not have an equivalent extension.
 - Only available in ctoken solana accounts (decompressed ctokens), not in compressed token accounts.
 - Stores compression info (rent sponsor, config, creation slot, etc.) for rent management.
 - Path: `program-libs/token-interface/src/state/extensions/compressible.rs`
 
 #### CompressedOnly
+
 - Marker extension indicating the account can only exist in compressed form.
 - Path: `program-libs/token-interface/src/state/extensions/compressed_only.rs`
 
 #### Pausable
+
 - Token account extension compatible with Token2022 PausableAccount extension.
 - Path: `program-libs/token-interface/src/state/extensions/pausable.rs`
 
 #### PermanentDelegate
+
 - Token account extension compatible with Token2022 PermanentDelegate extension.
 - Path: `program-libs/token-interface/src/state/extensions/permanent_delegate.rs`
 
 #### TransferFee
+
 - Token account extension compatible with Token2022 TransferFee extension.
 - Path: `program-libs/token-interface/src/state/extensions/transfer_fee.rs`
 
 #### TransferHook
+
 - Token account extension compatible with Token2022 TransferHook extension.
 - Path: `program-libs/token-interface/src/state/extensions/transfer_hook.rs`