diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 8137d8c..a00c017 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -1,19 +1,26 @@
 name: Setup Environment
-description: Setup Rust, Solana CLI, and Light CLI for testing
+description: Setup Rust, Solana CLI, and optionally Node.js for testing
 
 inputs:
+  example:
+    description: "Example directory path"
+    required: true
   solana-cli-version:
     description: "Solana CLI version"
     required: false
-    default: "2.1.21"
+    default: "2.3.11"
   rust-toolchain:
     description: "Rust toolchain version"
     required: false
-    default: "1.85.0"
+    default: "1.90.0"
   light-cli-version:
     description: "Light CLI version"
     required: false
     default: "alpha"
+  photon-indexer:
+    description: "Install Photon indexer (required for TypeScript tests)"
+    required: false
+    default: "false"
 
 runs:
   using: composite
@@ -22,18 +29,20 @@ runs:
       uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         toolchain: ${{ inputs.rust-toolchain }}
-        cache: false
+        rustflags: ""
+        cache-workspaces: ${{ inputs.example || '.' }}
 
-    - name: Setup Node.js (for Light CLI)
+    - name: Setup Node.js
+      if: inputs.node-version != ''
       uses: actions/setup-node@v4
       with:
-        node-version: "22"
+        node-version: ${{ inputs.node-version }}
 
-    - name: Cache npm global packages
-      uses: actions/cache@v4
+    - name: Setup Node.js (for Light CLI)
+      if: inputs.node-version == ''
+      uses: actions/setup-node@v4
       with:
-        path: ~/.npm
-        key: npm-${{ runner.os }}-light-cli-${{ inputs.light-cli-version }}
+        node-version: "22"
 
     - name: Cache Solana CLI tools
       uses: actions/cache@v4
@@ -41,7 +50,7 @@ runs:
         path: |
           ~/.cache/solana/
           ~/.local/share/solana/
-        key: solana-cli-${{ runner.os }}-${{ inputs.solana-cli-version }}
+        key: solana-cli-${{ runner.os }}-build-${{ inputs.solana-cli-version }}
 
     - name: Install Solana CLI tools
       shell: bash
@@ -53,6 +62,21 @@ runs:
       shell: bash
       run: npm install -g @lightprotocol/zk-compression-cli@${{ inputs.light-cli-version }}
 
+    - name: Cache Photon indexer
+      if: inputs.photon-indexer == 'true'
+      id: cache-photon
+      uses: actions/cache@v4
+      with:
+        path: ~/.cargo/bin/photon
+        key: photon-${{ runner.os }}-ac7df6c388db847b7693a7a1cb766a7c9d7809b5
+
+    - name: Install Photon indexer
+      if: inputs.photon-indexer == 'true' && steps.cache-photon.outputs.cache-hit != 'true'
+      shell: bash
+      env:
+        RUSTFLAGS: "-A dead-code"
+      run: cargo install --git https://github.com/lightprotocol/photon.git --rev ac7df6c388db847b7693a7a1cb766a7c9d7809b5 --locked --force
+
     - name: Generate keypair
       shell: bash
       run: solana-keygen new --no-bip39-passphrase
@@ -64,4 +88,3 @@ runs:
         cargo --version
         solana --version
         light --version
-
diff --git a/.gitignore b/.gitignore
index 8563720..ea6b209 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,27 @@
+# Dependencies
 **/node_modules/
 **/dist/
+
+# Environment and secrets
 **/.env
+**/.env.*
+**/*-keypair.json
+**/id.json
+
+# Build artifacts
+**/target
+**/.anchor
+
+# Test artifacts
+**/test-ledger
+
+# Lock files
 **/pnpm-lock.yaml
 **/package-lock.json
+
+# Backups
 **/*.json.bak
-**/test-ledger
-**/target
-cli/accounts
-README.html
-README_files/
 
-**/.surfpool
-.surfpool
\ No newline at end of file
+# Project-specific
+cli/accounts/
+bugs.md
diff --git a/CLAUDE.md b/CLAUDE.md
index 672c9ff..448f225 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -2,209 +2,76 @@
 
 This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
 
-## Project overview
+## What this repo is
 
-Light Token examples repository demonstrating rent-free token operations on Solana. Light Token reduces mint and token account costs by 200x through sponsored rent-exemption.
+Light Token example programs demonstrating rent-free token vaults using Light Protocol on Solana. Contains Anchor programs (escrow, fundraiser, token-swap, light-token-minter), a shared test utilities crate, TypeScript client examples, and toolkits (payments, streaming).
 
-## Build and test commands
+## Build and test
 
-### TypeScript client
+All Anchor programs live in `programs/anchor/` as a Cargo workspace. Build and test from that directory:
 
 ```bash
-# Install dependencies (from repo root — npm workspaces)
-npm install
-
-# Run from typescript-client directory
-cd typescript-client
-npm run test:actions              # Run all action examples (chained sequentially)
-npm run test:instructions         # Run all instruction examples (chained sequentially)
-
-# Individual examples (pattern: <operation>:<level>)
-npm run create-mint:action        # Create light-token mint
-npm run create-mint:instruction   # Create mint with manual instruction building
-npm run transfer-interface:action # Transfer between account types
-npm run wrap:action               # Wrap SPL/T22 to light-token
-npm run unwrap:action             # Unwrap light-token to SPL/T22
-npm run load-ata:action           # Load compressed tokens into light ATA
-npm run delegate:approve          # Approve delegate
-npm run delegate:revoke           # Revoke delegate
-
-# All examples require a running validator — see "Local development" below
-```
-
-### Rust client
-
-```bash
-cd rust-client
-cargo run --example action_create_mint
-cargo run --example action_transfer_interface
-cargo run --example instruction_transfer_interface
-```
-
-### Anchor programs
-
-```bash
-cd programs/anchor
-
-anchor build
-
-# Test single program (recommended — must use single thread)
-cargo test-sbf -p <package-name> -- --test-threads=1
+# Build a single program
+cd programs/anchor && cargo build-sbf --manifest-path escrow/Cargo.toml
 
-# Package names: light-token-anchor-transfer-interface, light-token-anchor-mint-to,
-# counter, create-and-transfer
-```
-
-### Privy Node.js (devnet)
-
-```bash
-cd toolkits/sign-with-privy/nodejs
-npm install
-cp .env.example .env  # fill in Privy credentials + Helius RPC URL
-
-# App operations (Privy-signed server wallet)
-npm run transfer      # Light-token ATA → ATA transfer (auto-loads cold balance)
-npm run wrap          # SPL/T22 → light-token ATA
-npm run unwrap        # Light-token ATA → SPL/T22
-npm run load          # Consolidate cold + SPL + T22 into light-token ATA
-npm run light-balance # Query Light Token balance (hot, cold, unified) for TEST_MINT
-npm run balances      # Query balance breakdown (hot, cold, SPL/T22, SOL)
-npm run history       # Transaction history for light-token interface ops
-
-# Setup helpers live in toolkits/sign-with-privy/scripts/ (separate workspace, uses local keypair)
-cd ../scripts
-npm run mint:spl-and-wrap <recipient>    # Create mint + interface PDA + fund treasury
-npm run mint:spl <mint> <recipient>     # Mint SPL/T22 tokens to existing mint
-npm run register:spl-interface <mint>   # Register interface PDA on existing mint
-```
+# Test a single program (runs LiteSVM-based tests, no validator needed)
+cd programs/anchor && cargo test-sbf -p escrow
+cd programs/anchor && cargo test-sbf -p fundraiser
+cd programs/anchor && cargo test-sbf -p light-token-minter
+cd programs/anchor && cargo test-sbf -p swap_example
 
-### Privy React (devnet — WIP)
+# Run a single test by name
+cd programs/anchor && cargo test-sbf -p escrow -- test_escrow_spl
 
-```bash
-cd toolkits/sign-with-privy/react
-npm install
-cp .env.example .env  # fill in VITE_PRIVY_APP_ID and VITE_HELIUS_RPC_URL
-
-npm run dev      # Vite dev server
-npm run build    # Production build
+# TypeScript client examples
+cd typescript-client && npm install && npm run create-mint:action
 ```
 
-### Local development
-
-```bash
-# Start test validator with Light programs (requires light CLI)
-light test-validator
-
-# Validator health check
-curl http://127.0.0.1:8784/health
-```
+CI runs `cargo test-sbf -p <package>` for each program (see `.github/workflows/rust-tests.yml`). Solana CLI 2.3.11, Rust 1.90.0.
 
 ## Architecture
 
-### Workspace layout
-
-Root `package.json` defines npm workspaces: `typescript-client`, `toolkits/payments-and-wallets`, `toolkits/sign-with-privy/nodejs`, `toolkits/sign-with-privy/react`, and `toolkits/sign-with-privy/scripts`. Dependencies are hoisted to root.
-
-- `typescript-client/` — Core examples: `actions/` (high-level) and `instructions/` (low-level)
-- `rust-client/` — Rust client examples as cargo examples
-- `programs/anchor/` — On-chain Anchor programs
-  - `basic-macros/` — Declarative `#[light_account]` macro pattern
-  - `basic-instructions/` — Explicit CPI calls to light-token program
-  - `create-and-transfer/` — Combined macro + CPI example
-- `toolkits/` — Domain-specific implementations
-  - `payments-and-wallets/` — Wallet integration patterns (uses `@lightprotocol/compressed-token/unified` subpath)
-  - `streaming-tokens/` — Laserstream-based token indexing
-  - `sign-with-privy/` — Privy wallet integration examples (devnet)
-    - `nodejs/` — Server-side scripts using `@privy-io/node` with server wallet signing
-    - `react/` — Browser app using `@privy-io/react-auth` with embedded wallet signing (WIP)
-
-### TypeScript: actions vs instructions
-
-Every example exists at two abstraction levels:
-
-**Actions** (`typescript-client/actions/`): Call high-level SDK functions that build, sign, and send transactions in one call. Functions like `createMintInterface`, `transferInterface`, `wrap` return a transaction signature directly.
-
-**Instructions** (`typescript-client/instructions/`): Build `TransactionInstruction` objects manually, assemble into `Transaction`, and call `sendAndConfirmTransaction`. Requires fetching tree info and validity proofs yourself:
-- `getBatchAddressTreeInfo()` — address tree for new account creation
-- `selectStateTreeInfo(await rpc.getStateTreeInfos())` — state tree selection
-- `rpc.getValidityProofV2([], [{address, treeInfo}])` — ZK validity proof
-- `ComputeBudgetProgram.setComputeUnitLimit({ units: 1_000_000 })` — required CU budget
-
-### Boilerplate pattern
-
-Every TypeScript example follows the same setup:
-
-```typescript
-import "dotenv/config";
-import { createRpc } from "@lightprotocol/stateless.js";
-
-// localnet (default — no args):
-const rpc = createRpc();
-// devnet:
-// const rpc = createRpc(`https://devnet.helius-rpc.com?api-key=${process.env.API_KEY!}`);
-
-// Payer from local Solana keypair:
-const payer = Keypair.fromSecretKey(
-    new Uint8Array(JSON.parse(readFileSync(`${homedir()}/.config/solana/id.json`, "utf8")))
-);
-```
-
-### Token flow concepts
-
-- **Light-token ATA**: Associated token account derived via `getAssociatedTokenAddressInterface(mint, owner)`. Created with `createAtaInterface` or `createAtaInterfaceIdempotent`.
-- **Wrap**: SPL/T22 tokens → light-token ATA. Requires SPL interface PDA registered via `createSplInterface`.
-- **Unwrap**: Light-token ATA → SPL/T22 tokens.
-- **Load ATA**: Compressed tokens (cold storage) → light-token ATA (hot balance). Uses `loadAta` action or `createLoadAtaInstructions` + `buildAndSignTx`/`sendAndConfirmTx`.
-- **Decompress**: Light-token ATA → SPL T22 account. Used as setup step before wrapping.
-
-### Two on-chain patterns (Anchor programs)
-
-**Macro pattern** (`basic-macros/`): Declarative `#[light_account(init)]` attribute and `LightAccounts` derive macro.
-
-**CPI pattern** (`basic-instructions/`): Explicit CPI calls like `TransferInterfaceCpi`.
-
-### Privy Node.js architecture (`toolkits/sign-with-privy/nodejs/`)
-
-Server-side scripts that sign transactions via Privy's wallet API instead of a local keypair. Each script in `src/` is standalone and runnable with `tsx`. All scripts target **devnet**.
+### Programs (`programs/anchor/`)
 
-**Script pattern**: Each file exports a reusable async function AND has a `// --- main ---` block at the bottom that imports config values and runs it. Scripts are both importable as modules and directly runnable via `npm run <script>`.
+All programs use `#[light_program]` + `#[program]` dual macros from Light Protocol. The `#[light_program]` macro generates `LightAccountVariant`, vault seed structs, and CPI signer boilerplate.
 
-**Signing**: Each script inlines its own Privy signing — no shared utilities between scripts. Pattern: build `Transaction` → serialize with `requireAllSignatures: false` → `privy.wallets().solana().signTransaction(walletId, { transaction, authorization_context })` → `sendRawTransaction` → `confirmTransaction`. Scripts that receive `TransactionInstruction[][]` from the SDK loop over batches sequentially.
+- **escrow** — Peer-to-peer token swap. `make_offer` creates an Offer account + rent-free Light vault; `take_offer` completes the swap and closes the vault. `Offer` derives `LightAccount` → generates `LightAccountVariant::Vault`, `VaultSeeds`, `OfferSeeds`.
+- **fundraiser** — Crowdfunding. `initialize` creates a Fundraiser + vault; `contribute`, `check_contributions`, `refund`. `Fundraiser` uses `#[account]` only (no `LightAccount` derive) → no cold/hot vault loading possible.
+- **token-swap** — AMM with `create_amm`, `create_pool`, `deposit_liquidity`, `withdraw_liquidity`, `swap_exact_tokens_for_tokens`, `create_pool_light_lp`.
+- **light-token-minter** — Helper program to create Light mints with metadata and mint tokens.
+- **shared-test-utils** — Reusable test helpers for SPL/T22/Light mint creation, ATA creation, SPL interface PDAs, balance verification. All programs depend on this for tests.
 
-**Two workspaces, two signing modes**:
+### Transfer routing (`shared.rs` in escrow/fundraiser)
 
-- **App operations** (`toolkits/sign-with-privy/nodejs/src/*.ts`): Privy server wallet signing. Seven scripts: `transfer`, `wrap`, `unwrap`, `load`, `light-balance`, `balances`, `get-transaction-history`.
-- **Setup helpers** (`toolkits/sign-with-privy/scripts/src/*.ts`): Separate npm workspace. Uses local filesystem keypair (`~/.config/solana/id.json`), not Privy. Scripts: `mint-spl-and-wrap`, `mint-spl`, `register-spl-interface`.
+Each program's `shared.rs` contains `transfer_tokens()` which picks the CPI path at runtime:
+- Both accounts Light → `TransferCheckedCpi` (direct, no interface PDA)
+- One SPL/T22 + one Light → `TransferInterfaceCpi` (cross-standard, requires SPL interface PDA)
 
-**Config**: All env vars centralized in `src/config.ts` with validation. Exports `TREASURY_WALLET_ID`, `TREASURY_WALLET_ADDRESS`, `TREASURY_AUTHORIZATION_KEY`, `HELIUS_RPC_URL`, `TEST_MINT`, and convenience defaults (`DEFAULT_TEST_RECIPIENT`, `DEFAULT_AMOUNT`, `DEFAULT_DECIMALS`). Scripts import from `./config.js` (ESM `.js` extension required).
+### Token configurations tested
 
-**Per-script details**:
+Each program tests 5 token standard combinations via `TokenConfig` enum:
+- `Spl` — SPL mint + SPL ATAs + Light vault
+- `Token2022` — T22 mint + T22 ATAs + Light vault
+- `Light` — Light mint + Light ATAs + Light vault
+- `LightSpl` — SPL mint, but user accounts converted to Light ATAs before escrow
+- `LightT22` — T22 mint, but user accounts converted to Light ATAs before escrow
 
-- **transfer** — Calls `createTransferInterfaceInstructions` (from `/unified` subpath) which returns `TransactionInstruction[][]`. Auto-loads cold balance before transferring. Usually one tx.
-- **wrap** — Manually assembles 3 instructions: `setComputeUnitLimit(200_000)` + `createAssociatedTokenAccountInterfaceIdempotentInstruction` + `createWrapInstruction`. Calls `getSplInterfaceInfos` (from root `@lightprotocol/compressed-token`, not `/unified`) to get `tokenProgram` and derive the correct SPL ATA.
-- **unwrap** — Calls `createUnwrapInstructions` from `/unified` subpath. Returns batched instructions handling load + unwrap together.
-- **load** — Calls `createLoadAtaInstructions`. Can return empty array (nothing to load). Derives light-token ATA via `getAssociatedTokenAddressInterface`.
-- **light-balance** — Queries hot (`getAtaInterface`) and cold (`getCompressedTokenBalancesByOwnerV2`) for a single `TEST_MINT`. Returns hot, cold, unified.
-- **balances** — Queries 4 sources: SOL (`getBalance`), hot (`getAtaInterface`), cold (`getCompressedTokenBalancesByOwnerV2`), SPL + T22 (raw `getTokenAccountsByOwner` with manual buffer parsing at offset 64). Hardcodes decimals=9.
-- **get-transaction-history** — Calls `getSignaturesForOwnerInterface`, a light-token specific RPC method.
+### Test setup pattern
 
-**Import subpaths**: Most light-token instructions come from `@lightprotocol/compressed-token/unified`. Exception: `getSplInterfaceInfos` comes from root `@lightprotocol/compressed-token`.
+Tests follow: `create_test_rpc()` → `setup_*_test(config)` → `create_token_account()`/`create_contributor()` → `run_*_full_flow()`. Common modules in `tests/common/mod.rs`.
 
-### Key dependencies
+### Cold/hot lifecycle (escrow only)
 
-- `@lightprotocol/compressed-token` beta — TypeScript token client (also exports `/unified` subpath for unwrap, load, balances)
-- `@lightprotocol/stateless.js` beta — TypeScript RPC client (`createRpc`, `buildAndSignTx`, `sendAndConfirmTx`)
-- `@solana/web3.js` 1.98.x — Solana web3 (v1, not v2)
-- `@solana/spl-token` 0.4.x — SPL token operations (used for T22 interop)
-- `@privy-io/node` ^0.1.0-alpha.2 — Server-side Privy SDK (Node.js scripts)
-- `light-sdk` 0.19.x — Rust core SDK
-- `light-token` 0.4.x — Rust token operations
-- Anchor 0.31.1, Solana SDK 2.2, Rust 1.90.0
+Light accounts auto-compress after rent expires. Escrow tests exercise the full cycle: create → `warp_to_compress` (calls `rpc.warp_epoch_forward(30)`) → `load_light_accounts` → transact. Fundraiser skips this because `Fundraiser` state lacks `LightAccount` derive.
 
-## Environment setup
+### Local path dependencies
 
-Copy `.env.example` to `.env` and set `API_KEY` for devnet/mainnet RPC access. Localnet uses default endpoints (no env needed).
+`light-client` and `light-program-test` use local path deps pointing to `~/Workspace/light-protocol/`. The workspace `Cargo.toml` also patches all `light-*` crates to local paths to avoid version conflicts.
 
-## Documentation
+## Key SDK patterns
 
-https://www.zkcompression.com/light-token/welcome
+- `CpiSigner` + `derive_light_cpi_signer!` at crate root for each program
+- Constants used in `token::owner_seeds` must be `pub use`-exported from `lib.rs`
+- Per-program rent sponsor PDA: `derive_rent_sponsor_pda(&program_id)` — separate from global `LIGHT_TOKEN_RENT_SPONSOR`
+- `get_create_accounts_proof()` fetches validity proofs for account creation (needed for `init` instructions, not reads)
+- `InitializeRentFreeConfig` sets up per-program compression config before any `#[light_account(init)]`
\ No newline at end of file
diff --git a/README.md b/README.md
index 93c22c8..cfc5b1b 100644
--- a/README.md
+++ b/README.md
@@ -54,11 +54,15 @@ Light token is a high-performance token standard that reduces the cost of mint a
 
 ## Program Examples
 
-### Examples 
+### Examples
 
 |  | Description |
 |---------|-------------|
-| [cp-swap-reference](https://github.com/Lightprotocol/cp-swap-reference/tree/954f679699dbdfe9711308c8ae9fbd21e69db8aa) | Fork of Raydium AMM that creates markets without paying rent-exemption. |
+| [escrow](programs/anchor/escrow) | Peer-to-peer light-token swap with offer/accept flow |
+| [fundraiser](programs/anchor/fundraiser) | Token fundraiser with target, deadline, and refunds |
+| [light-token-minter](programs/anchor/light-token-minter) | Create light-mints with metadata, mint tokens |
+| [token-swap](programs/anchor/token-swap) | AMM with liquidity pools and swaps |
+| [cp-swap-reference](https://github.com/Lightprotocol/cp-swap-reference/tree/954f679699dbdfe9711308c8ae9fbd21e69db8aa) | Fork of Raydium AMM that creates markets without paying rent-exemption |
 | [create-and-transfer](programs/anchor/create-and-transfer) | Create account via macro and transfer via CPI |
 
 ### Macros
@@ -66,7 +70,7 @@ Light token is a high-performance token standard that reduces the cost of mint a
 |  | Description |
 |---------|-------------|
 | [counter](programs/anchor/basic-macros/counter) | Create, increment and close counter PDA with sponsored rent-exemption |
-| [create-associated-token-account](programs/anchor/basic-macros/create-ata) | Create associated light-token account |
+| [create-associated-token-account](programs/anchor/basic-macros/create-associated-token-account) | Create associated light-token account |
 | [create-mint](programs/anchor/basic-macros/create-mint) | Create light-token mint |
 | [create-token-account](programs/anchor/basic-macros/create-token-account) | Create light-token account |
 
@@ -80,7 +84,7 @@ For existing programs, you can replace spl_token with light_token instructions a
 | [approve](programs/anchor/basic-instructions/approve/src/lib.rs) | Approve delegate via CPI |
 | [burn](programs/anchor/basic-instructions/burn/src/lib.rs) | Burn tokens via CPI |
 | [close](programs/anchor/basic-instructions/close/src/lib.rs) | Close token account via CPI |
-| [create-associated-token-account](programs/anchor/basic-instructions/create-ata/src/lib.rs) | Create associated light-token account via CPI |
+| [create-associated-token-account](programs/anchor/basic-instructions/create-associated-token-account/src/lib.rs) | Create associated light-token account via CPI |
 | [create-mint](programs/anchor/basic-instructions/create-mint/src/lib.rs) | Create light-token mint via CPI |
 | [create-token-account](programs/anchor/basic-instructions/create-token-account/src/lib.rs) | Create light-token account via CPI |
 | [freeze](programs/anchor/basic-instructions/freeze/src/lib.rs) | Freeze token account via CPI |
diff --git a/programs/anchor/Cargo.lock b/programs/anchor/Cargo.lock
index 7d83cd1..2c86c77 100644
--- a/programs/anchor/Cargo.lock
+++ b/programs/anchor/Cargo.lock
@@ -131,7 +131,7 @@ checksum = "48a526ec4434d531d488af59fe866f36b310fe8906691c75dffa664450a3800a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -490,7 +490,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60"
 dependencies = [
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -516,7 +516,7 @@ dependencies = [
  "num-traits",
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -591,7 +591,7 @@ checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -653,7 +653,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -679,6 +679,28 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
+[[package]]
+name = "aws-lc-rs"
+version = "1.15.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b7b6141e96a8c160799cc2d5adecd5cbbe5054cb8c7c4af53da0f83bb7ad256"
+dependencies = [
+ "aws-lc-sys",
+ "zeroize",
+]
+
+[[package]]
+name = "aws-lc-sys"
+version = "0.37.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b092fe214090261288111db7a2b2c2118e5a7f30dc2569f1732c4069a6840549"
+dependencies = [
+ "cc",
+ "cmake",
+ "dunce",
+ "fs_extra",
+]
+
 [[package]]
 name = "base64"
 version = "0.12.3"
@@ -720,9 +742,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af"
 dependencies = [
  "serde_core",
 ]
@@ -814,7 +836,7 @@ dependencies = [
  "proc-macro-crate 3.4.0",
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -908,7 +930,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -935,9 +957,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.55"
+version = "1.2.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b26a0954ae34af09b50f0de26458fa95369a0d478d8236d3f93082b219bd29"
+checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -945,6 +967,12 @@ dependencies = [
  "shlex",
 ]
 
+[[package]]
+name = "cesu8"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
+
 [[package]]
 name = "cfg-if"
 version = "1.0.4"
@@ -965,7 +993,7 @@ checksum = "45565fc9416b9896014f5732ac776f810ee53a66730c17e4020c3ec064a8f88f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -977,7 +1005,6 @@ dependencies = [
  "iana-time-zone",
  "js-sys",
  "num-traits",
- "serde",
  "wasm-bindgen",
  "windows-link",
 ]
@@ -992,6 +1019,15 @@ dependencies = [
  "inout",
 ]
 
+[[package]]
+name = "cmake"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75443c44cd6b379beb8c5b45d85d0773baf31cce901fe7bb252f4eff3008ef7d"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "combine"
 version = "3.8.1"
@@ -1005,6 +1041,16 @@ dependencies = [
  "unreachable",
 ]
 
+[[package]]
+name = "combine"
+version = "4.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+dependencies = [
+ "bytes",
+ "memchr",
+]
+
 [[package]]
 name = "compression-codecs"
 version = "0.4.36"
@@ -1072,6 +1118,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "core-foundation"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.7"
@@ -1083,13 +1139,12 @@ name = "counter"
 version = "0.1.0"
 dependencies = [
  "anchor-lang",
- "blake3",
  "light-account",
- "light-client 0.20.0",
- "light-compressed-account 0.10.1",
+ "light-client",
+ "light-compressed-account",
  "light-hasher",
- "light-program-test 0.20.0",
- "light-sdk 0.20.0",
+ "light-program-test",
+ "light-sdk",
  "solana-account-info",
  "solana-instruction",
  "solana-keypair",
@@ -1126,15 +1181,12 @@ version = "0.1.0"
 dependencies = [
  "anchor-lang",
  "borsh 0.10.4",
- "light-client 0.19.0",
- "light-compressible 0.4.0",
- "light-program-test 0.19.0",
- "light-sdk 0.19.0",
- "light-sdk-macros 0.19.0",
- "light-sdk-types 0.19.0",
- "light-token 0.4.0",
- "light-token-interface 0.3.0",
- "light-token-types 0.4.0",
+ "light-account",
+ "light-client",
+ "light-program-test",
+ "light-sdk",
+ "light-token",
+ "light-token-interface",
  "solana-account-info",
  "solana-instruction",
  "solana-keypair",
@@ -1255,7 +1307,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -1279,7 +1331,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -1290,17 +1342,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.115",
-]
-
-[[package]]
-name = "deranged"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc3dc5ad92c2e2d1c193bbbbdf2ea477cb81331de4f3103f267ca18368b988c4"
-dependencies = [
- "powerfmt",
- "serde_core",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -1348,14 +1390,14 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
-name = "dyn-clone"
-version = "1.0.20"
+name = "dunce"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 
 [[package]]
 name = "eager"
@@ -1419,7 +1461,7 @@ dependencies = [
  "enum-ordinalize 4.3.2",
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -1460,7 +1502,7 @@ checksum = "685adfa4d6f3d765a26bc5dbc936577de9abf756c1feeb3089b01dd395034842"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -1473,7 +1515,7 @@ dependencies = [
  "num-traits",
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -1493,7 +1535,7 @@ checksum = "8ca9601fb2d62598ee17836250842873a413586e5d7ed88b356e38ddbb0ec631"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -1619,6 +1661,12 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "fs_extra"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
+
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -1627,9 +1675,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1642,9 +1690,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -1652,15 +1700,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -1669,38 +1717,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893"
 
 [[package]]
 name = "futures-task"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393"
 
 [[package]]
 name = "futures-util"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -1710,7 +1758,6 @@ dependencies = [
  "futures-task",
  "memchr",
  "pin-project-lite",
- "pin-utils",
  "slab",
 ]
 
@@ -1814,7 +1861,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.13.0",
+ "indexmap",
  "slab",
  "tokio",
  "tokio-util 0.7.18",
@@ -1833,7 +1880,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http 1.4.0",
- "indexmap 2.13.0",
+ "indexmap",
  "slab",
  "tokio",
  "tokio-util 0.7.18",
@@ -1849,12 +1896,6 @@ dependencies = [
  "byteorder",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
 [[package]]
 name = "hashbrown"
 version = "0.13.2"
@@ -1905,12 +1946,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
 [[package]]
 name = "hmac"
 version = "0.8.1"
@@ -2283,17 +2318,6 @@ dependencies = [
  "icu_properties",
 ]
 
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
- "serde",
-]
-
 [[package]]
 name = "indexmap"
 version = "2.13.0"
@@ -2386,6 +2410,28 @@ version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2"
 
+[[package]]
+name = "jni"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
+dependencies = [
+ "cesu8",
+ "cfg-if",
+ "combine 4.6.7",
+ "jni-sys",
+ "log",
+ "thiserror 1.0.69",
+ "walkdir",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
+
 [[package]]
 name = "jobserver"
 version = "0.1.34"
@@ -2433,9 +2479,9 @@ dependencies = [
 
 [[package]]
 name = "keccak"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
+checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653"
 dependencies = [
  "cpufeatures",
 ]
@@ -2454,9 +2500,9 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
 
 [[package]]
 name = "libc"
-version = "0.2.181"
+version = "0.2.182"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "459427e2af2b9c839b132acb702a1c654d95e10f8c326bfc2ad11310e458b1c5"
+checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112"
 
 [[package]]
 name = "libsecp256k1"
@@ -2508,37 +2554,24 @@ dependencies = [
 
 [[package]]
 name = "light-account"
-version = "0.20.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f7464c25ca421182041ad563d81bf059aa5cd54d8c81caadc46e3999dcd34db"
+checksum = "44bd2aa4022dddcc09896624da69c975b3fdf9f78470d690886370b1ef72f5df"
 dependencies = [
  "anchor-lang",
- "light-account-checks 0.8.0",
- "light-compressed-account 0.10.1",
- "light-compressible 0.5.0",
+ "light-account-checks",
+ "light-compressed-account",
+ "light-compressible",
  "light-hasher",
  "light-macros",
- "light-sdk-macros 0.20.0",
- "light-sdk-types 0.20.0",
+ "light-sdk-macros",
+ "light-sdk-types",
+ "light-token-interface",
  "solana-account-info",
  "solana-instruction",
  "solana-pubkey",
 ]
 
-[[package]]
-name = "light-account-checks"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f20b8640212dd450e18d452a247e28d8ba6fdce3c713fd8b69f1e95874d1b7ab"
-dependencies = [
- "solana-account-info",
- "solana-msg",
- "solana-program-error",
- "solana-pubkey",
- "solana-sysvar",
- "thiserror 2.0.18",
-]
-
 [[package]]
 name = "light-account-checks"
 version = "0.8.0"
@@ -2582,44 +2615,19 @@ dependencies = [
 
 [[package]]
 name = "light-batched-merkle-tree"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01e838c523b49371097f948cd5662bd9a89d9dca037fb61fd38001e99f485702"
-dependencies = [
- "aligned-sized",
- "borsh 0.10.4",
- "light-account-checks 0.7.0",
- "light-bloom-filter",
- "light-compressed-account 0.9.0",
- "light-hasher",
- "light-macros",
- "light-merkle-tree-metadata 0.9.0",
- "light-verifier 8.0.0",
- "light-zero-copy",
- "solana-account-info",
- "solana-msg",
- "solana-program-error",
- "solana-pubkey",
- "solana-sysvar",
- "thiserror 2.0.18",
- "zerocopy",
-]
-
-[[package]]
-name = "light-batched-merkle-tree"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb07ef41d9d99db94072d556767a93d774323bc34940db349555abc4504de015"
+checksum = "3702b96798a1cc93c9d4b0d9eb6ee980481beb147ab663cfd260c71ec258c5f0"
 dependencies = [
  "aligned-sized",
  "borsh 0.10.4",
- "light-account-checks 0.8.0",
+ "light-account-checks",
  "light-bloom-filter",
- "light-compressed-account 0.10.1",
+ "light-compressed-account",
  "light-hasher",
  "light-macros",
- "light-merkle-tree-metadata 0.10.0",
- "light-verifier 9.0.0",
+ "light-merkle-tree-metadata",
+ "light-verifier",
  "light-zero-copy",
  "solana-account-info",
  "solana-msg",
@@ -2657,64 +2665,9 @@ dependencies = [
 
 [[package]]
 name = "light-client"
-version = "0.19.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33203f596d48d28d1cb67dee5762b151e0073207a5e828c63ec68f9efb9a5ee8"
-dependencies = [
- "anchor-lang",
- "async-trait",
- "base64 0.13.1",
- "borsh 0.10.4",
- "bs58",
- "futures",
- "lazy_static",
- "light-compressed-account 0.9.0",
- "light-compressible 0.4.0",
- "light-concurrent-merkle-tree",
- "light-event 0.4.0",
- "light-hasher",
- "light-indexed-merkle-tree",
- "light-merkle-tree-metadata 0.9.0",
- "light-prover-client 6.0.0",
- "light-sdk 0.19.0",
- "light-token 0.4.0",
- "light-token-interface 0.3.0",
- "litesvm",
- "num-bigint 0.4.6",
- "photon-api",
- "rand 0.8.5",
- "smallvec",
- "solana-account",
- "solana-account-decoder-client-types",
- "solana-address-lookup-table-interface",
- "solana-banks-client",
- "solana-clock",
- "solana-commitment-config",
- "solana-compute-budget-interface",
- "solana-hash",
- "solana-instruction",
- "solana-keypair",
- "solana-message",
- "solana-program-error",
- "solana-pubkey",
- "solana-rpc-client",
- "solana-rpc-client-api",
- "solana-signature",
- "solana-transaction",
- "solana-transaction-error",
- "solana-transaction-status-client-types",
- "spl-pod",
- "spl-token-2022-interface",
- "thiserror 2.0.18",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "light-client"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "002ae865925850ff8d83448965b79c50c767886415df943170a29715103ded45"
+checksum = "ae5fd01c523a68d5a04fa89826fc4dd7e5719afa1a67c1748ff6ccdffdb65deb"
 dependencies = [
  "anchor-lang",
  "async-trait",
@@ -2724,19 +2677,19 @@ dependencies = [
  "futures",
  "lazy_static",
  "light-account",
- "light-compressed-account 0.10.1",
+ "light-compressed-account",
  "light-compressed-token-sdk",
- "light-compressible 0.5.0",
+ "light-compressible",
  "light-concurrent-merkle-tree",
- "light-event 0.20.0",
+ "light-event",
  "light-hasher",
  "light-indexed-merkle-tree",
- "light-merkle-tree-metadata 0.10.0",
- "light-prover-client 7.0.0",
- "light-sdk 0.20.0",
- "light-sdk-types 0.20.0",
- "light-token 0.20.0",
- "light-token-interface 0.4.0",
+ "light-merkle-tree-metadata",
+ "light-prover-client",
+ "light-sdk",
+ "light-sdk-types",
+ "light-token",
+ "light-token-interface",
  "litesvm",
  "num-bigint 0.4.6",
  "photon-api",
@@ -2772,31 +2725,9 @@ dependencies = [
 
 [[package]]
 name = "light-compressed-account"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c3537bbad9df133ca97fc191b164bba93dba1de4da01a92d979ef63f8ce106"
-dependencies = [
- "anchor-lang",
- "borsh 0.10.4",
- "bytemuck",
- "light-hasher",
- "light-macros",
- "light-poseidon 0.3.0",
- "light-program-profiler",
- "light-zero-copy",
- "solana-msg",
- "solana-program-error",
- "solana-pubkey",
- "thiserror 2.0.18",
- "tinyvec",
- "zerocopy",
-]
-
-[[package]]
-name = "light-compressed-account"
-version = "0.10.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adab5a8dddd9675306b0a808900578ed60b40b5c5457e330e28c9cb51361118d"
+checksum = "c2ce168f42dab1a4c01ad83993d68b17cd2dc1bb31ced8ab4edecaf5b666a8ad"
 dependencies = [
  "anchor-lang",
  "borsh 0.10.4",
@@ -2816,21 +2747,21 @@ dependencies = [
 
 [[package]]
 name = "light-compressed-token-sdk"
-version = "0.20.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76e56f85162c02208b24d7d9c817a24de1f6116e49f5751b7d8761c72f0021ff"
+checksum = "6b537399b0910b7ec821f3ef24d56d11b59ad370e877cc4dbe697b81abed5a38"
 dependencies = [
  "anchor-lang",
  "arrayvec",
  "borsh 0.10.4",
  "light-account",
- "light-account-checks 0.8.0",
- "light-compressed-account 0.10.1",
+ "light-account-checks",
+ "light-compressed-account",
  "light-program-profiler",
- "light-sdk 0.20.0",
- "light-sdk-types 0.20.0",
- "light-token-interface 0.4.0",
- "light-token-types 0.20.0",
+ "light-sdk",
+ "light-sdk-types",
+ "light-token-interface",
+ "light-token-types",
  "light-zero-copy",
  "solana-account-info",
  "solana-cpi",
@@ -2843,42 +2774,16 @@ dependencies = [
 
 [[package]]
 name = "light-compressible"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00d1dc14271907009f4ca23ae99c49279f7d2acc5a83f0f8d7362834b37e2e16"
-dependencies = [
- "aligned-sized",
- "anchor-lang",
- "borsh 0.10.4",
- "bytemuck",
- "light-account-checks 0.7.0",
- "light-compressed-account 0.9.0",
- "light-hasher",
- "light-macros",
- "light-program-profiler",
- "light-zero-copy",
- "pinocchio-pubkey",
- "solana-msg",
- "solana-program-error",
- "solana-pubkey",
- "solana-rent",
- "solana-sysvar",
- "thiserror 2.0.18",
- "zerocopy",
-]
-
-[[package]]
-name = "light-compressible"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0905b52848daea4cb7edbc9ddca0a8d5c4f1d864e89eff0aca3b6fc2a9edbb2"
+checksum = "54745d82dab271a4178b48c48d5768ff54af0a6e01aae62425003c25ed394fc5"
 dependencies = [
  "aligned-sized",
  "anchor-lang",
  "borsh 0.10.4",
  "bytemuck",
- "light-account-checks 0.8.0",
- "light-compressed-account 0.10.1",
+ "light-account-checks",
+ "light-compressed-account",
  "light-hasher",
  "light-macros",
  "light-program-profiler",
@@ -2906,26 +2811,14 @@ dependencies = [
 
 [[package]]
 name = "light-event"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4bae725ee1d4d944d442ac0bfdf2031b1b2379c04c7e39c475277aaaea08fb1"
-dependencies = [
- "borsh 0.10.4",
- "light-compressed-account 0.9.0",
- "light-hasher",
- "light-zero-copy",
- "thiserror 2.0.18",
-]
-
-[[package]]
-name = "light-event"
-version = "0.20.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8d71e91a43f85421eee408bc9656de3158b27389310ba06a4a1c5bf2f87468e"
+checksum = "a6543f1fab85efda214a3b59368be10ccbc56be15afa85ab382a18aca9d10d57"
 dependencies = [
  "borsh 0.10.4",
- "light-compressed-account 0.10.1",
+ "light-compressed-account",
  "light-hasher",
+ "light-token-interface",
  "light-zero-copy",
  "thiserror 2.0.18",
 ]
@@ -2978,35 +2871,16 @@ dependencies = [
 
 [[package]]
 name = "light-instruction-decoder"
-version = "0.2.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7f4bd98e842f21b754ec28020a56de37cb0b1089952ef24340d21c2d5afd5c5"
+checksum = "91ccc58230852f10fd60cbe5d0c1725857b78e59ec50ec73ba118bda93b077c5"
 dependencies = [
  "borsh 0.10.4",
  "bs58",
- "light-compressed-account 0.9.0",
+ "light-compressed-account",
  "light-instruction-decoder-derive",
- "light-sdk-types 0.19.0",
- "light-token-interface 0.3.0",
- "serde",
- "solana-instruction",
- "solana-pubkey",
- "solana-signature",
- "tabled",
-]
-
-[[package]]
-name = "light-instruction-decoder"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab1c2c1594a3373d0ce2a0af11568c4f1455cb00aa42a606becb49254b0b6c2c"
-dependencies = [
- "borsh 0.10.4",
- "bs58",
- "light-compressed-account 0.10.1",
- "light-instruction-decoder-derive",
- "light-sdk-types 0.20.0",
- "light-token-interface 0.4.0",
+ "light-sdk-types",
+ "light-token-interface",
  "serde",
  "solana-instruction",
  "solana-pubkey",
@@ -3016,9 +2890,9 @@ dependencies = [
 
 [[package]]
 name = "light-instruction-decoder-derive"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2035d04a0a1590da05634efcac149a2ac852565e28c9a55bd07a6620c0e90bff"
+checksum = "f96a1bb5483eee012a2a61c28f352528e89f28f3cd6601558c1cfc1c0bc2961f"
 dependencies = [
  "bs58",
  "darling",
@@ -3026,7 +2900,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sha2 0.10.9",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -3039,36 +2913,19 @@ dependencies = [
  "proc-macro2",
  "quote",
  "solana-pubkey",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
 name = "light-merkle-tree-metadata"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15c2e63e8345dcfb80efac69136fdcc6c36a12354675aca6e3daf13ec40422d1"
-dependencies = [
- "anchor-lang",
- "borsh 0.10.4",
- "bytemuck",
- "light-compressed-account 0.9.0",
- "solana-msg",
- "solana-program-error",
- "solana-sysvar",
- "thiserror 2.0.18",
- "zerocopy",
-]
-
-[[package]]
-name = "light-merkle-tree-metadata"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7623246ad0015345f6a88471f554381e24635b770fe4b15b38384daddf1d2f5f"
+checksum = "ee2ef127f8b968a22203515fca1822cb54bb8f0bd84de392fcb9fb0b77855393"
 dependencies = [
  "anchor-lang",
  "borsh 0.10.4",
  "bytemuck",
- "light-compressed-account 0.10.1",
+ "light-compressed-account",
  "solana-msg",
  "solana-program-error",
  "solana-sysvar",
@@ -3121,7 +2978,7 @@ checksum = "0a8be18fe4de58a6f754caa74a3fbc6d8a758a26f1f3c24d5b0f5b55df5f5408"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -3135,62 +2992,9 @@ dependencies = [
 
 [[package]]
 name = "light-program-test"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e85916a9da34a44971e1a30badaf04cb75213fbfa9f61a139ea6ebd0f021bdde"
-dependencies = [
- "anchor-lang",
- "async-trait",
- "base64 0.13.1",
- "borsh 0.10.4",
- "bs58",
- "bytemuck",
- "chrono",
- "light-client 0.19.0",
- "light-compressed-account 0.9.0",
- "light-compressible 0.4.0",
- "light-event 0.4.0",
- "light-hasher",
- "light-indexed-array",
- "light-indexed-merkle-tree",
- "light-instruction-decoder 0.2.0",
- "light-merkle-tree-metadata 0.9.0",
- "light-merkle-tree-reference",
- "light-prover-client 6.0.0",
- "light-sdk 0.19.0",
- "light-sdk-types 0.19.0",
- "light-token 0.4.0",
- "light-token-interface 0.3.0",
- "light-zero-copy",
- "litesvm",
- "log",
- "num-bigint 0.4.6",
- "num-traits",
- "photon-api",
- "rand 0.8.5",
- "reqwest 0.12.28",
- "serde",
- "serde_json",
- "solana-account",
- "solana-banks-client",
- "solana-compute-budget",
- "solana-instruction",
- "solana-pubkey",
- "solana-rpc-client-api",
- "solana-sdk",
- "solana-transaction",
- "solana-transaction-status",
- "solana-transaction-status-client-types",
- "spl-token-2022 7.0.0",
- "tabled",
- "tokio",
-]
-
-[[package]]
-name = "light-program-test"
-version = "0.20.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49ebb1ed994a05ca5974ad1b701f0dde6c136e41d6387daca7e061720e41b41b"
+checksum = "c6897c2a1a320de66ce09c7d4e365c1cd409cd7ef45afe890ee3d1c9ad5dc3bf"
 dependencies = [
  "anchor-lang",
  "async-trait",
@@ -3200,23 +3004,23 @@ dependencies = [
  "bytemuck",
  "chrono",
  "light-account",
- "light-account-checks 0.8.0",
- "light-client 0.20.0",
- "light-compressed-account 0.10.1",
+ "light-account-checks",
+ "light-client",
+ "light-compressed-account",
  "light-compressed-token-sdk",
- "light-compressible 0.5.0",
- "light-event 0.20.0",
+ "light-compressible",
+ "light-event",
  "light-hasher",
  "light-indexed-array",
  "light-indexed-merkle-tree",
- "light-instruction-decoder 0.20.0",
- "light-merkle-tree-metadata 0.10.0",
+ "light-instruction-decoder",
+ "light-merkle-tree-metadata",
  "light-merkle-tree-reference",
- "light-prover-client 7.0.0",
- "light-sdk 0.20.0",
- "light-sdk-types 0.20.0",
- "light-token 0.20.0",
- "light-token-interface 0.4.0",
+ "light-prover-client",
+ "light-sdk",
+ "light-sdk-types",
+ "light-token",
+ "light-token-interface",
  "light-zero-copy",
  "litesvm",
  "log",
@@ -3244,38 +3048,14 @@ dependencies = [
 
 [[package]]
 name = "light-prover-client"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd2195f4573628a8aaca37504cde1b1903b8ed20e2706acbad875b7d41acbeab"
-dependencies = [
- "ark-bn254 0.5.0",
- "ark-serialize 0.5.0",
- "ark-std 0.5.0",
- "light-compressed-account 0.9.0",
- "light-hasher",
- "light-indexed-array",
- "light-sparse-merkle-tree",
- "num-bigint 0.4.6",
- "num-traits",
- "reqwest 0.11.27",
- "serde",
- "serde_json",
- "solana-bn254",
- "thiserror 2.0.18",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "light-prover-client"
-version = "7.0.0"
+version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee6e9906d0b834ec2dfe1baf95d61c010f64b3151f4733195fffb8b964ad2763"
+checksum = "1a9b434c4819c575c53b439a04cef23e14a7359728d9438a10e6de3641a6d3ba"
 dependencies = [
  "ark-bn254 0.5.0",
  "ark-serialize 0.5.0",
  "ark-std 0.5.0",
- "light-compressed-account 0.10.1",
+ "light-compressed-account",
  "light-hasher",
  "light-indexed-array",
  "light-sparse-merkle-tree",
@@ -3292,54 +3072,22 @@ dependencies = [
 
 [[package]]
 name = "light-sdk"
-version = "0.19.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7f523c64a6fcdafe6df81d647560770529896f2707be8ffcf048d909b7e2b30"
-dependencies = [
- "anchor-lang",
- "bincode",
- "borsh 0.10.4",
- "light-account-checks 0.7.0",
- "light-compressed-account 0.9.0",
- "light-compressible 0.4.0",
- "light-hasher",
- "light-macros",
- "light-sdk-macros 0.19.0",
- "light-sdk-types 0.19.0",
- "light-zero-copy",
- "num-bigint 0.4.6",
- "solana-account-info",
- "solana-clock",
- "solana-cpi",
- "solana-instruction",
- "solana-loader-v3-interface",
- "solana-msg",
- "solana-program",
- "solana-program-error",
- "solana-pubkey",
- "solana-system-interface",
- "solana-sysvar",
- "thiserror 2.0.18",
-]
-
-[[package]]
-name = "light-sdk"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf31676e72039c1663c9c0cc207572f5bfea985f7a39de346b942b3f4c3b92fe"
+checksum = "1e3820e6de3d2f1de335a3dbb35a44edd5ee9dd73510022d693112b9e34f1aa8"
 dependencies = [
  "anchor-lang",
  "bincode",
  "borsh 0.10.4",
  "bytemuck",
- "light-account-checks 0.8.0",
- "light-compressed-account 0.10.1",
+ "light-account-checks",
+ "light-compressed-account",
  "light-hasher",
  "light-macros",
  "light-program-profiler",
- "light-sdk-macros 0.20.0",
- "light-sdk-types 0.20.0",
- "light-token-interface 0.4.0",
+ "light-sdk-macros",
+ "light-sdk-types",
+ "light-token-interface",
  "light-zero-copy",
  "num-bigint 0.4.6",
  "solana-account-info",
@@ -3358,65 +3106,34 @@ dependencies = [
 
 [[package]]
 name = "light-sdk-macros"
-version = "0.19.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3d12bb13b84df21a4871dc0837aafc0b48464d3e9b17e2773c0719b6cc724c5"
+checksum = "498c1603fa593185d03f2d4a00f91886f318f5d2163cd32ed0e59d0f92eb3c92"
 dependencies = [
  "darling",
  "light-hasher",
- "light-sdk-types 0.19.0",
+ "light-sdk-types",
  "proc-macro2",
  "quote",
  "solana-pubkey",
- "syn 2.0.115",
-]
-
-[[package]]
-name = "light-sdk-macros"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7186366be777810e54f4025ff388d4463c2314df452a2e7f14cb218977fc1ac7"
-dependencies = [
- "darling",
- "light-hasher",
- "light-sdk-types 0.20.0",
- "proc-macro2",
- "quote",
- "solana-pubkey",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
 name = "light-sdk-types"
-version = "0.19.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d8153b27d057ded7b2b6bbd78c643e3f20bd9a9718ca1a8d4183169ccd812c3"
-dependencies = [
- "anchor-lang",
- "borsh 0.10.4",
- "light-account-checks 0.7.0",
- "light-compressed-account 0.9.0",
- "light-hasher",
- "light-macros",
- "solana-msg",
- "thiserror 2.0.18",
-]
-
-[[package]]
-name = "light-sdk-types"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d60036a8f1af0d3aa651780aa57ae2cdca3fa0f16acecda71c98f81a53e37c9"
+checksum = "67d2142429691a2bfe10e12d426c72131523352815b5b254915e85b81d274f8e"
 dependencies = [
  "anchor-lang",
  "borsh 0.10.4",
  "bytemuck",
- "light-account-checks 0.8.0",
- "light-compressed-account 0.10.1",
- "light-compressible 0.5.0",
+ "light-account-checks",
+ "light-compressed-account",
+ "light-compressible",
  "light-hasher",
  "light-macros",
- "light-token-interface 0.4.0",
+ "light-token-interface",
  "solana-msg",
  "solana-program-error",
  "thiserror 2.0.18",
@@ -3437,57 +3154,26 @@ dependencies = [
 
 [[package]]
 name = "light-token"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71fd2e8ca6d7d70c77658010e1ae6ed6d4fe23e29054964b053f51e5c4676e49"
-dependencies = [
- "anchor-lang",
- "arrayvec",
- "borsh 0.10.4",
- "light-account-checks 0.7.0",
- "light-batched-merkle-tree 0.9.0",
- "light-compressed-account 0.9.0",
- "light-compressible 0.4.0",
- "light-macros",
- "light-program-profiler",
- "light-sdk 0.19.0",
- "light-sdk-macros 0.19.0",
- "light-sdk-types 0.19.0",
- "light-token-interface 0.3.0",
- "light-token-types 0.4.0",
- "light-zero-copy",
- "solana-account-info",
- "solana-cpi",
- "solana-instruction",
- "solana-msg",
- "solana-program-error",
- "solana-pubkey",
- "spl-pod",
- "thiserror 2.0.18",
-]
-
-[[package]]
-name = "light-token"
-version = "0.20.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9940ddbb68ace4cd49e9312bb1d573146232c6460b95f669433b9e1c16fa147b"
+checksum = "b910f2bd3c4b297fe9fef956381620decad989db22daa28c9af81a8655f6a8ed"
 dependencies = [
  "anchor-lang",
  "arrayvec",
  "borsh 0.10.4",
  "light-account",
- "light-account-checks 0.8.0",
- "light-batched-merkle-tree 0.10.0",
- "light-compressed-account 0.10.1",
+ "light-account-checks",
+ "light-batched-merkle-tree",
+ "light-compressed-account",
  "light-compressed-token-sdk",
- "light-compressible 0.5.0",
+ "light-compressible",
  "light-macros",
  "light-program-profiler",
- "light-sdk 0.20.0",
- "light-sdk-macros 0.20.0",
- "light-sdk-types 0.20.0",
- "light-token-interface 0.4.0",
- "light-token-types 0.20.0",
+ "light-sdk",
+ "light-sdk-macros",
+ "light-sdk-types",
+ "light-token-interface",
+ "light-token-types",
  "light-zero-copy",
  "solana-account-info",
  "solana-cpi",
@@ -3505,10 +3191,10 @@ version = "0.1.0"
 dependencies = [
  "anchor-lang",
  "borsh 0.10.4",
- "light-client 0.19.0",
- "light-program-test 0.19.0",
- "light-sdk 0.19.0",
- "light-token 0.4.0",
+ "light-client",
+ "light-program-test",
+ "light-sdk",
+ "light-token",
  "solana-sdk",
  "test-utils",
  "tokio",
@@ -3520,10 +3206,10 @@ version = "0.1.0"
 dependencies = [
  "anchor-lang",
  "borsh 0.10.4",
- "light-client 0.19.0",
- "light-program-test 0.19.0",
- "light-sdk 0.19.0",
- "light-token 0.4.0",
+ "light-client",
+ "light-program-test",
+ "light-sdk",
+ "light-token",
  "solana-sdk",
  "test-utils",
  "tokio",
@@ -3535,10 +3221,10 @@ version = "0.1.0"
 dependencies = [
  "anchor-lang",
  "borsh 0.10.4",
- "light-client 0.19.0",
- "light-program-test 0.19.0",
- "light-sdk 0.19.0",
- "light-token 0.4.0",
+ "light-client",
+ "light-program-test",
+ "light-sdk",
+ "light-token",
  "solana-sdk",
  "test-utils",
  "tokio",
@@ -3550,10 +3236,10 @@ version = "0.1.0"
 dependencies = [
  "anchor-lang",
  "borsh 0.10.4",
- "light-client 0.19.0",
- "light-program-test 0.19.0",
- "light-sdk 0.19.0",
- "light-token 0.4.0",
+ "light-client",
+ "light-program-test",
+ "light-sdk",
+ "light-token",
  "solana-sdk",
  "tokio",
 ]
@@ -3564,10 +3250,10 @@ version = "0.1.0"
 dependencies = [
  "anchor-lang",
  "borsh 0.10.4",
- "light-client 0.19.0",
- "light-program-test 0.19.0",
- "light-sdk 0.19.0",
- "light-token 0.4.0",
+ "light-client",
+ "light-program-test",
+ "light-sdk",
+ "light-token",
  "solana-sdk",
  "tokio",
 ]
@@ -3578,10 +3264,10 @@ version = "0.1.0"
 dependencies = [
  "anchor-lang",
  "borsh 0.10.4",
- "light-client 0.19.0",
- "light-program-test 0.19.0",
- "light-sdk 0.19.0",
- "light-token 0.4.0",
+ "light-client",
+ "light-program-test",
+ "light-sdk",
+ "light-token",
  "solana-sdk",
  "tokio",
 ]
@@ -3592,10 +3278,10 @@ version = "0.1.0"
 dependencies = [
  "anchor-lang",
  "borsh 0.10.4",
- "light-client 0.19.0",
- "light-program-test 0.19.0",
- "light-sdk 0.19.0",
- "light-token 0.4.0",
+ "light-client",
+ "light-program-test",
+ "light-sdk",
+ "light-token",
  "solana-sdk",
  "test-utils",
  "tokio",
@@ -3607,10 +3293,10 @@ version = "0.1.0"
 dependencies = [
  "anchor-lang",
  "borsh 0.10.4",
- "light-client 0.19.0",
- "light-program-test 0.19.0",
- "light-sdk 0.19.0",
- "light-token 0.4.0",
+ "light-client",
+ "light-program-test",
+ "light-sdk",
+ "light-token",
  "solana-sdk",
  "test-utils",
  "tokio",
@@ -3622,10 +3308,10 @@ version = "0.1.0"
 dependencies = [
  "anchor-lang",
  "borsh 0.10.4",
- "light-client 0.19.0",
- "light-program-test 0.19.0",
- "light-sdk 0.19.0",
- "light-token 0.4.0",
+ "light-client",
+ "light-program-test",
+ "light-sdk",
+ "light-token",
  "solana-sdk",
  "test-utils",
  "tokio",
@@ -3637,10 +3323,10 @@ version = "0.1.0"
 dependencies = [
  "anchor-lang",
  "borsh 0.10.4",
- "light-client 0.19.0",
- "light-program-test 0.19.0",
- "light-sdk 0.19.0",
- "light-token 0.4.0",
+ "light-client",
+ "light-program-test",
+ "light-sdk",
+ "light-token",
  "solana-sdk",
  "test-utils",
  "tokio",
@@ -3652,9 +3338,9 @@ version = "0.1.0"
 dependencies = [
  "anchor-lang",
  "borsh 0.10.4",
- "light-program-test 0.19.0",
- "light-sdk 0.19.0",
- "light-token 0.4.0",
+ "light-program-test",
+ "light-sdk",
+ "light-token",
  "solana-sdk",
  "test-utils",
  "tokio",
@@ -3667,10 +3353,10 @@ dependencies = [
  "anchor-lang",
  "anchor-spl",
  "borsh 0.10.4",
- "light-program-test 0.19.0",
- "light-sdk 0.19.0",
- "light-token 0.4.0",
- "light-token-types 0.4.0",
+ "light-program-test",
+ "light-sdk",
+ "light-token",
+ "light-token-types",
  "solana-sdk",
  "test-utils",
  "tokio",
@@ -3678,45 +3364,17 @@ dependencies = [
 
 [[package]]
 name = "light-token-interface"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46decebc2a13ec984e2ba7f1e691c0d46b9061875c6bdd12636b7c100a60e6c"
-dependencies = [
- "aligned-sized",
- "anchor-lang",
- "borsh 0.10.4",
- "bytemuck",
- "light-array-map",
- "light-compressed-account 0.9.0",
- "light-compressible 0.4.0",
- "light-hasher",
- "light-macros",
- "light-program-profiler",
- "light-zero-copy",
- "pinocchio",
- "pinocchio-pubkey",
- "solana-account-info",
- "solana-pubkey",
- "spl-pod",
- "spl-token-2022 7.0.0",
- "thiserror 2.0.18",
- "tinyvec",
- "zerocopy",
-]
-
-[[package]]
-name = "light-token-interface"
-version = "0.4.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a457179188d9b6b7208a8a63a1fea851f818adfde3faaa262474bdcd3e3c7d"
+checksum = "b14661b6592711d90b1cac2402fa10310d90e0517e035c6b1f47c30a14883461"
 dependencies = [
  "aligned-sized",
  "anchor-lang",
  "borsh 0.10.4",
  "bytemuck",
  "light-array-map",
- "light-compressed-account 0.10.1",
- "light-compressible 0.5.0",
+ "light-compressed-account",
+ "light-compressible",
  "light-hasher",
  "light-macros",
  "light-program-profiler",
@@ -3738,18 +3396,13 @@ version = "0.1.0"
 dependencies = [
  "anchor-lang",
  "borsh 0.10.4",
- "light-client 0.19.0",
- "light-compressed-account 0.9.0",
- "light-compressible 0.4.0",
+ "light-account",
+ "light-client",
  "light-hasher",
- "light-macros",
- "light-program-test 0.19.0",
- "light-sdk 0.19.0",
- "light-sdk-macros 0.19.0",
- "light-sdk-types 0.19.0",
- "light-token 0.4.0",
- "light-token-interface 0.3.0",
- "light-token-types 0.4.0",
+ "light-program-test",
+ "light-sdk",
+ "light-token",
+ "light-token-interface",
  "solana-account-info",
  "solana-instruction",
  "solana-keypair",
@@ -3767,20 +3420,14 @@ name = "light-token-macro-create-mint"
 version = "0.1.0"
 dependencies = [
  "anchor-lang",
- "borsh 0.10.4",
+ "light-account",
  "light-anchor-spl",
- "light-client 0.19.0",
- "light-compressed-account 0.9.0",
- "light-compressible 0.4.0",
+ "light-client",
  "light-hasher",
- "light-macros",
- "light-program-test 0.19.0",
- "light-sdk 0.19.0",
- "light-sdk-macros 0.19.0",
- "light-sdk-types 0.19.0",
- "light-token 0.4.0",
- "light-token-interface 0.3.0",
- "light-token-types 0.4.0",
+ "light-program-test",
+ "light-sdk",
+ "light-token",
+ "light-token-interface",
  "solana-account-info",
  "solana-instruction",
  "solana-keypair",
@@ -3797,19 +3444,13 @@ name = "light-token-macro-create-token-account"
 version = "0.1.0"
 dependencies = [
  "anchor-lang",
- "borsh 0.10.4",
- "light-client 0.19.0",
- "light-compressed-account 0.9.0",
- "light-compressible 0.4.0",
+ "light-account",
+ "light-client",
  "light-hasher",
- "light-macros",
- "light-program-test 0.19.0",
- "light-sdk 0.19.0",
- "light-sdk-macros 0.19.0",
- "light-sdk-types 0.19.0",
- "light-token 0.4.0",
- "light-token-interface 0.3.0",
- "light-token-types 0.4.0",
+ "light-program-test",
+ "light-sdk",
+ "light-token",
+ "light-token-interface",
  "solana-account-info",
  "solana-instruction",
  "solana-keypair",
@@ -3824,55 +3465,28 @@ dependencies = [
 
 [[package]]
 name = "light-token-types"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "411481fe2e04b1241235c2572480c153c5669507e227f5e3327057b0d2ba5734"
-dependencies = [
- "anchor-lang",
- "borsh 0.10.4",
- "light-account-checks 0.7.0",
- "light-compressed-account 0.9.0",
- "light-macros",
- "light-sdk-types 0.19.0",
- "solana-msg",
- "thiserror 2.0.18",
-]
-
-[[package]]
-name = "light-token-types"
-version = "0.20.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3daffe234719b109238a81d3b61009b9005a58a014436124edf55600361187e2"
+checksum = "c8e7683ae232f9744864890591433811a2cb34f13af631d23d5b296666a05673"
 dependencies = [
  "anchor-lang",
  "borsh 0.10.4",
- "light-account-checks 0.8.0",
- "light-compressed-account 0.10.1",
+ "light-account-checks",
+ "light-compressed-account",
  "light-macros",
- "light-sdk-types 0.20.0",
+ "light-sdk-types",
  "solana-msg",
  "thiserror 2.0.18",
 ]
 
 [[package]]
 name = "light-verifier"
-version = "8.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecba4c14ac08b078a9d84033d628b12bb2577141f405140d506bacd392a830bc"
-dependencies = [
- "groth16-solana",
- "light-compressed-account 0.9.0",
- "thiserror 2.0.18",
-]
-
-[[package]]
-name = "light-verifier"
-version = "9.0.0"
+version = "10.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65a33dc6b302f2cfb7319006f1234f1d86c992ac1991ade7c97653828b7f1735"
+checksum = "0d829f997b17c7c65198bb93f0d645a4b2818aed2bd14bf2716e36171d4a9f3f"
 dependencies = [
  "groth16-solana",
- "light-compressed-account 0.10.1",
+ "light-compressed-account",
  "thiserror 2.0.18",
 ]
 
@@ -3896,7 +3510,7 @@ dependencies = [
  "lazy_static",
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -3922,7 +3536,7 @@ dependencies = [
  "agave-reserved-account-keys",
  "ansi_term",
  "bincode",
- "indexmap 2.13.0",
+ "indexmap",
  "itertools 0.14.0",
  "log",
  "solana-account",
@@ -4037,16 +3651,6 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
-[[package]]
-name = "mime_guess"
-version = "2.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
-dependencies = [
- "mime",
- "unicase",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.8.9"
@@ -4070,9 +3674,9 @@ dependencies = [
 
 [[package]]
 name = "native-tls"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6cdede44f9a69cab2899a2049e2c3bd49bf911a157f6a3353d4a91c61abbce44"
+checksum = "9d5d26952a508f321b4d3d2e80e78fc2603eaefcdf0c30783867f19586518bdc"
 dependencies = [
  "libc",
  "log",
@@ -4131,12 +3735,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "num-conv"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf97ec579c3c42f953ef76dbf8d55ac91fb219dde70e49aa4a6b7d74e9919050"
-
 [[package]]
 name = "num-derive"
 version = "0.4.2"
@@ -4145,7 +3743,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -4208,7 +3806,7 @@ dependencies = [
  "proc-macro-crate 3.4.0",
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -4235,7 +3833,7 @@ version = "0.10.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -4252,14 +3850,14 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.6"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
 
 [[package]]
 name = "openssl-src"
@@ -4368,17 +3966,14 @@ dependencies = [
 
 [[package]]
 name = "photon-api"
-version = "0.54.0"
+version = "0.55.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e572dba0c255f5b8176f15b9e849330d915a8927804f7f9702d5bbbc70e4a1ad"
+checksum = "d6115e10f0d42f3c66b942a8a7f579e82a3fd724cd398e6f56a2b3e4cb8f15c7"
 dependencies = [
- "reqwest 0.12.28",
+ "progenitor-client",
+ "reqwest 0.13.2",
  "serde",
- "serde_derive",
  "serde_json",
- "serde_with",
- "url",
- "uuid",
 ]
 
 [[package]]
@@ -4398,7 +3993,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -4463,12 +4058,6 @@ dependencies = [
  "zerovec",
 ]
 
-[[package]]
-name = "powerfmt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-
 [[package]]
 name = "ppv-lite86"
 version = "0.2.21"
@@ -4485,7 +4074,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
 dependencies = [
  "proc-macro2",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -4525,7 +4114,7 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -4537,6 +4126,21 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "progenitor-client"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffab7b358944dba033a7b324e7558e66e6bcb1fb4705cf57f26fd5092bcae630"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "percent-encoding",
+ "reqwest 0.13.2",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+]
+
 [[package]]
 name = "qstring"
 version = "0.7.2"
@@ -4554,7 +4158,7 @@ checksum = "9e2e25ee72f5b24d773cae88422baddefff7714f97aab68d96fe2b6fc4a28fb2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -4583,6 +4187,7 @@ version = "0.11.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
 dependencies = [
+ "aws-lc-rs",
  "bytes",
  "getrandom 0.3.4",
  "lru-slab",
@@ -4759,27 +4364,7 @@ version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
- "bitflags 2.10.0",
-]
-
-[[package]]
-name = "ref-cast"
-version = "1.0.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d"
-dependencies = [
- "ref-cast-impl",
-]
-
-[[package]]
-name = "ref-cast-impl"
-version = "1.0.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.115",
+ "bitflags 2.11.0",
 ]
 
 [[package]]
@@ -4878,7 +4463,6 @@ dependencies = [
  "js-sys",
  "log",
  "mime",
- "mime_guess",
  "native-tls",
  "percent-encoding",
  "pin-project-lite",
@@ -4902,6 +4486,47 @@ dependencies = [
  "webpki-roots 1.0.6",
 ]
 
+[[package]]
+name = "reqwest"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "http 1.4.0",
+ "http-body 1.0.1",
+ "http-body-util",
+ "hyper 1.8.1",
+ "hyper-rustls 0.27.7",
+ "hyper-util",
+ "js-sys",
+ "log",
+ "percent-encoding",
+ "pin-project-lite",
+ "quinn",
+ "rustls 0.23.36",
+ "rustls-pki-types",
+ "rustls-platform-verifier",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper 1.0.2",
+ "tokio",
+ "tokio-rustls 0.26.4",
+ "tokio-util 0.7.18",
+ "tower",
+ "tower-http",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-streams",
+ "web-sys",
+]
+
 [[package]]
 name = "reqwest-middleware"
 version = "0.4.2"
@@ -4958,7 +4583,7 @@ version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -4983,6 +4608,7 @@ version = "0.23.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b"
 dependencies = [
+ "aws-lc-rs",
  "once_cell",
  "ring",
  "rustls-pki-types",
@@ -4991,6 +4617,18 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "rustls-native-certs"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63"
+dependencies = [
+ "openssl-probe",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework",
+]
+
 [[package]]
 name = "rustls-pemfile"
 version = "1.0.4"
@@ -5010,6 +4648,33 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "rustls-platform-verifier"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784"
+dependencies = [
+ "core-foundation 0.10.1",
+ "core-foundation-sys",
+ "jni",
+ "log",
+ "once_cell",
+ "rustls 0.23.36",
+ "rustls-native-certs",
+ "rustls-platform-verifier-android",
+ "rustls-webpki 0.103.9",
+ "security-framework",
+ "security-framework-sys",
+ "webpki-root-certs",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "rustls-platform-verifier-android"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
+
 [[package]]
 name = "rustls-webpki"
 version = "0.101.7"
@@ -5026,6 +4691,7 @@ version = "0.103.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53"
 dependencies = [
+ "aws-lc-rs",
  "ring",
  "rustls-pki-types",
  "untrusted",
@@ -5044,36 +4710,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
 
 [[package]]
-name = "schannel"
-version = "0.1.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
-dependencies = [
- "windows-sys 0.61.2",
-]
-
-[[package]]
-name = "schemars"
-version = "0.9.0"
+name = "same-file"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
 dependencies = [
- "dyn-clone",
- "ref-cast",
- "serde",
- "serde_json",
+ "winapi-util",
 ]
 
 [[package]]
-name = "schemars"
-version = "1.2.1"
+name = "schannel"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc"
+checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
 dependencies = [
- "dyn-clone",
- "ref-cast",
- "serde",
- "serde_json",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -5094,12 +4745,12 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.11.1"
+version = "3.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+checksum = "d17b898a6d6948c3a8ee4372c17cb384f90d2e6e912ef00895b14fd7ab54ec38"
 dependencies = [
- "bitflags 2.10.0",
- "core-foundation",
+ "bitflags 2.11.0",
+ "core-foundation 0.10.1",
  "core-foundation-sys",
  "libc",
  "security-framework-sys",
@@ -5107,9 +4758,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.15.0"
+version = "2.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0"
+checksum = "321c8673b092a9a42605034a9879d73cb79101ed5fd117bc9a597b89b4e9e61a"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -5167,7 +4818,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -5210,17 +4861,8 @@ version = "3.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fa237f2807440d238e0364a218270b98f767a00d3dada77b1c53ae88940e2e7"
 dependencies = [
- "base64 0.22.1",
- "chrono",
- "hex",
- "indexmap 1.9.3",
- "indexmap 2.13.0",
- "schemars 0.9.0",
- "schemars 1.2.1",
  "serde_core",
- "serde_json",
  "serde_with_macros",
- "time",
 ]
 
 [[package]]
@@ -5232,7 +4874,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -6090,7 +5732,7 @@ version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e0e85a6fad5c2d0c4f5b91d34b8ca47118fc593af706e523cdbedf846a954f57"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "solana-account-info",
  "solana-instruction",
  "solana-program-error",
@@ -6360,7 +6002,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "004f2d2daf407b3ec1a1ca5ec34b3ccdfd6866dd2d3c7d0715004a96e4b6d127"
 dependencies = [
  "bincode",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "cfg_eval",
  "serde",
  "serde_derive",
@@ -6801,7 +6443,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "474a2d95dc819898ded08d24f29642d02189d3e1497bbb442a92a3997b7eb55f"
 dependencies = [
  "byteorder",
- "combine",
+ "combine 3.8.1",
  "hash32",
  "libc",
  "log",
@@ -6900,7 +6542,7 @@ dependencies = [
  "bs58",
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -7680,7 +7322,7 @@ checksum = "d9e8418ea6269dcfb01c712f0444d2c75542c04448b480e87de59d2865edc750"
 dependencies = [
  "quote",
  "spl-discriminator-syn",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -7692,7 +7334,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sha2 0.10.9",
- "syn 2.0.115",
+ "syn 2.0.116",
  "thiserror 1.0.69",
 ]
 
@@ -7813,7 +7455,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sha2 0.10.9",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -7825,7 +7467,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sha2 0.10.9",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -8359,9 +8001,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.115"
+version = "2.0.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e614ed320ac28113fa64972c4262d5dbc89deacdfd00c34a3e4cea073243c12"
+checksum = "3df424c70518695237746f84cede799c9c58fcb37450d7b23716568cc8bc69cb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8391,7 +8033,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -8401,7 +8043,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation",
+ "core-foundation 0.9.4",
  "system-configuration-sys 0.5.0",
 ]
 
@@ -8411,8 +8053,8 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b"
 dependencies = [
- "bitflags 2.10.0",
- "core-foundation",
+ "bitflags 2.11.0",
+ "core-foundation 0.9.4",
  "system-configuration-sys 0.6.0",
 ]
 
@@ -8457,7 +8099,7 @@ dependencies = [
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -8527,9 +8169,9 @@ dependencies = [
 name = "test-utils"
 version = "0.1.0"
 dependencies = [
- "light-client 0.19.0",
- "light-program-test 0.19.0",
- "light-token 0.4.0",
+ "light-client",
+ "light-program-test",
+ "light-token",
  "solana-sdk",
  "tokio",
 ]
@@ -8569,7 +8211,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -8580,7 +8222,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -8592,37 +8234,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "time"
-version = "0.3.47"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c"
-dependencies = [
- "deranged",
- "itoa",
- "num-conv",
- "powerfmt",
- "serde_core",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca"
-
-[[package]]
-name = "time-macros"
-version = "0.2.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215"
-dependencies = [
- "num-conv",
- "time-core",
-]
-
 [[package]]
 name = "tinystr"
 version = "0.8.2"
@@ -8673,7 +8284,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -8795,7 +8406,7 @@ version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
- "indexmap 2.13.0",
+ "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime 0.6.11",
@@ -8809,7 +8420,7 @@ version = "0.23.10+spec-1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269"
 dependencies = [
- "indexmap 2.13.0",
+ "indexmap",
  "toml_datetime 0.7.5+spec-1.1.0",
  "toml_parser",
  "winnow",
@@ -8817,9 +8428,9 @@ dependencies = [
 
 [[package]]
 name = "toml_parser"
-version = "1.0.8+spec-1.1.0"
+version = "1.0.9+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0742ff5ff03ea7e67c8ae6c93cac239e0d9784833362da3f9a9c1da8dfefcbdc"
+checksum = "702d4415e08923e7e1ef96cd5727c0dfed80b4d2fa25db9647fe5eb6f7c5a4c4"
 dependencies = [
  "winnow",
 ]
@@ -8852,7 +8463,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
 dependencies = [
  "async-compression",
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "bytes",
  "futures-core",
  "futures-util",
@@ -8900,7 +8511,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -8949,17 +8560,11 @@ version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 
-[[package]]
-name = "unicase"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142"
-
 [[package]]
 name = "unicode-ident"
-version = "1.0.23"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "537dd038a89878be9b64dd4bd1b260315c1bb94f4d784956b81e27a088d9a09e"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
 [[package]]
 name = "unicode-segmentation"
@@ -9032,18 +8637,6 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
-[[package]]
-name = "uuid"
-version = "1.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee48d38b119b0cd71fe4141b30f5ba9c7c5d9f4e7a3a8b4a674e4b6ef789976f"
-dependencies = [
- "getrandom 0.3.4",
- "js-sys",
- "serde_core",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "valuable"
 version = "0.1.1"
@@ -9068,6 +8661,16 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
 [[package]]
 name = "want"
 version = "0.3.1"
@@ -9153,7 +8756,7 @@ dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
  "wasm-bindgen-shared",
 ]
 
@@ -9183,20 +8786,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
 dependencies = [
  "anyhow",
- "indexmap 2.13.0",
+ "indexmap",
  "wasm-encoder",
  "wasmparser",
 ]
 
+[[package]]
+name = "wasm-streams"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1ec4f6517c9e11ae630e200b2b65d193279042e28edd4a2cda233e46670bbb"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
 [[package]]
 name = "wasmparser"
 version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.11.0",
  "hashbrown 0.15.2",
- "indexmap 2.13.0",
+ "indexmap",
  "semver",
 ]
 
@@ -9220,6 +8836,15 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "webpki-root-certs"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "804f18a4ac2676ffb4e8b5b5fa9ae38af06df08162314f96a68d2a363e21a8ca"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "webpki-roots"
 version = "0.25.4"
@@ -9287,7 +8912,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -9298,7 +8923,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -9336,6 +8961,15 @@ dependencies = [
  "windows-link",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -9381,6 +9015,21 @@ dependencies = [
  "windows-link",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -9429,6 +9078,12 @@ dependencies = [
  "windows_x86_64_msvc 0.53.1",
 ]
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -9447,6 +9102,12 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -9465,6 +9126,12 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -9495,6 +9162,12 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -9513,6 +9186,12 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -9531,6 +9210,12 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -9549,6 +9234,12 @@ version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -9614,9 +9305,9 @@ checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
 dependencies = [
  "anyhow",
  "heck 0.5.0",
- "indexmap 2.13.0",
+ "indexmap",
  "prettyplease",
- "syn 2.0.115",
+ "syn 2.0.116",
  "wasm-metadata",
  "wit-bindgen-core",
  "wit-component",
@@ -9632,7 +9323,7 @@ dependencies = [
  "prettyplease",
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
  "wit-bindgen-core",
  "wit-bindgen-rust",
 ]
@@ -9644,8 +9335,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
 dependencies = [
  "anyhow",
- "bitflags 2.10.0",
- "indexmap 2.13.0",
+ "bitflags 2.11.0",
+ "indexmap",
  "log",
  "serde",
  "serde_derive",
@@ -9664,7 +9355,7 @@ checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
 dependencies = [
  "anyhow",
  "id-arena",
- "indexmap 2.13.0",
+ "indexmap",
  "log",
  "semver",
  "serde",
@@ -9708,7 +9399,7 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
  "synstructure",
 ]
 
@@ -9729,7 +9420,7 @@ checksum = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -9749,7 +9440,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
  "synstructure",
 ]
 
@@ -9770,7 +9461,7 @@ checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
@@ -9803,7 +9494,7 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.115",
+ "syn 2.0.116",
 ]
 
 [[package]]
diff --git a/programs/anchor/Cargo.toml b/programs/anchor/Cargo.toml
index b21e620..e9c075b 100644
--- a/programs/anchor/Cargo.toml
+++ b/programs/anchor/Cargo.toml
@@ -44,29 +44,34 @@ anchor-lang = "0.31.1"
 anchor-spl = "0.31.1"
 
 # Solana
-solana-sdk = "2.2"
-solana-program = "2.2"
-solana-pubkey = "2.2"
-solana-msg = "2.2"
-solana-account-info = "2.2"
-solana-program-error = "2.2"
-solana-instruction = "2.2"
-solana-keypair = "2.2"
-solana-signer = "2.2"
+solana-sdk = "2"
+solana-program = "2"
+solana-pubkey = "2"
+solana-msg = "2"
+solana-account-info = "2"
+solana-program-error = "2"
+solana-instruction = "2"
+solana-keypair = "2"
+solana-signer = "2"
+
+# SPL
+spl-token = "7"
+spl-token-2022 = "7"
 
 # Light Protocol
-light-sdk = { version = "0.19.0", features = ["anchor", "v2", "anchor-discriminator", "cpi-context"] }
-light-sdk-macros = "0.19.0"
-light-sdk-types = { version = "0.19.0", features = ["v2", "cpi-context"] }
-light-compressible = { version = "0.4.0", features = ["anchor"] }
+light-sdk = { version = "0.22.0", features = ["anchor", "v2", "cpi-context"] }
+light-sdk-macros = "0.22.0"
+light-sdk-types = { version = "0.22.0", features = ["v2", "cpi-context"] }
+light-account = { version = "0.22.0", features = ["anchor", "token"] }
+light-compressible = { version = "0.6.0", features = ["anchor"] }
 light-hasher = { version = "5.0.0", features = ["solana"] }
 light-macros = "2.2.0"
-light-compressed-account = "0.9.0"
-light-token = { version = "0.4.0", features = ["anchor"] }
-light-token-types = { version = "0.4.0", features = ["anchor"] }
-light-token-interface = "0.3.0"
-light-program-test = "0.19.0"
-light-client = { version = "0.19.0", features = ["v2", "anchor"] }
+light-compressed-account = "0.11.0"
+light-token = { version = "0.22.1", features = ["anchor"] }
+light-token-types = { version = "0.22.0", features = ["anchor"] }
+light-token-interface = "0.5.0"
+light-program-test = "0.22.0"
+light-client = { version = "0.22.0", features = ["v2", "anchor"] }
 light-anchor-spl = "0.31.1"
 
 # Testing
diff --git a/programs/anchor/README.md b/programs/anchor/README.md
index 5637adf..6a10533 100644
--- a/programs/anchor/README.md
+++ b/programs/anchor/README.md
@@ -1,56 +1,85 @@
-# Light Token Anchor programs
-
-### Examples
-
-|  | Description |
-|---------|-------------|
-| [cp-swap-reference](https://github.com/Lightprotocol/cp-swap-reference/tree/954f679699dbdfe9711308c8ae9fbd21e69db8aa) | Fork of Raydium AMM that creates markets without paying rent-exemption. |
-| [create-and-transfer](programs/anchor/create-and-transfer) | Create account via macro and transfer via CPI |
-
-### Macros
-
-|  | Description |
-|---------|-------------|
-| [counter](programs/anchor/basic-macros/counter) | Create, increment and close counter PDA with sponsored rent-exemption |
-| [create-associated-token-account](programs/anchor/basic-macros/create-ata) | Create associated light-token account |
-| [create-mint](programs/anchor/basic-macros/create-mint) | Create light-token mint |
-| [create-token-account](programs/anchor/basic-macros/create-token-account) | Create light-token account |
-
-### Instructions
-
-The instructions use pure CPI calls which you can combine with existing and / or light macros.
-For existing programs, you can replace spl_token with light_token instructions as you need. The API is a superset of SPL-token so switching is straightforward.
-
-|  | Description |
-|---------|-------------|
-| [approve](programs/anchor/basic-instructions/approve/src/lib.rs) | Approve delegate via CPI |
-| [burn](programs/anchor/basic-instructions/burn/src/lib.rs) | Burn tokens via CPI |
-| [close](programs/anchor/basic-instructions/close/src/lib.rs) | Close token account via CPI |
-| [create-associated-token-account](programs/anchor/basic-instructions/create-ata/src/lib.rs) | Create associated light-token account via CPI |
-| [create-mint](programs/anchor/basic-instructions/create-mint/src/lib.rs) | Create light-token mint via CPI |
-| [create-token-account](programs/anchor/basic-instructions/create-token-account/src/lib.rs) | Create light-token account via CPI |
-| [freeze](programs/anchor/basic-instructions/freeze/src/lib.rs) | Freeze token account via CPI |
-| [mint-to](programs/anchor/basic-instructions/mint-to/src/lib.rs) | Mint tokens via CPI |
-| [revoke](programs/anchor/basic-instructions/revoke/src/lib.rs) | Revoke delegate via CPI |
-| [thaw](programs/anchor/basic-instructions/thaw/src/lib.rs) | Thaw token account via CPI |
-| [transfer-checked](programs/anchor/basic-instructions/transfer-checked/src/lib.rs) | Transfer with mint validation via CPI |
-| [transfer-interface](programs/anchor/basic-instructions/transfer-interface/src/lib.rs) | Transfer between light-token, T22, and SPL accounts via CPI |
-
-## Build and test
+# Light Token Anchor Solana Programs
 
-```bash
-# for localnet
-npm i -g @lightprotocol/zk-compression-cli@alpha
-```
+- **[escrow](escrow/src/lib.rs)** - Peer-to-peer light-token swap with offer/accept flow
+- **[fundraiser](fundraiser/src/lib.rs)** - Token Fundraiser with target, deadline, and refunds
+- **[light-token-minter](light-token-minter/src/lib.rs)** - Create light-mints with metadata, mint tokens
+- **[token-swap](token-swap/src/lib.rs)** - AMM with liquidity pools and swaps
+
+## Basic Macros
+
+- [**counter**](basic-macros/counter/src/lib.rs) - Minimal Light-PDA example
+- [**create-mint**](basic-macros/create-mint/src/lib.rs) - Create a light-token mint
+- [**create-associated-token-account**](basic-macros/create-associated-token-account/src/lib.rs) - Create an associated light-token account
+- [**create-token-account**](basic-macros/create-token-account/src/lib.rs) - Create a light-token account
+- [**create-and-transfer**](create-and-transfer/src/lib.rs) - Create a light-token account and transfer in one instruction
+
+## Basic Instructions
+
+- [**create-mint**](basic-instructions/create-mint/src/lib.rs) - Create a light-token mint via CPI
+- [**create-associated-token-account**](basic-instructions/create-associated-token-account/src/lib.rs) - Create an associated light-token account via CPI
+- [**create-token-account**](basic-instructions/create-token-account/src/lib.rs) - Create a light-token account via CPI
+- [**mint-to**](basic-instructions/mint-to/src/lib.rs) - Mint tokens via CPI
+- [**transfer-interface**](basic-instructions/transfer-interface/src/lib.rs) - Transfer between light-token, T22, and SPL accounts via CPI
+- [**transfer-checked**](basic-instructions/transfer-checked/src/lib.rs) - Transfer with decimal validation against mint via CPI
+- [**approve**](basic-instructions/approve/src/lib.rs) - Approve delegate via CPI
+- [**revoke**](basic-instructions/revoke/src/lib.rs) - Revoke delegate via CPI
+- [**burn**](basic-instructions/burn/src/lib.rs) - Burn tokens via CPI
+- [**freeze**](basic-instructions/freeze/src/lib.rs) - Freeze token account via CPI
+- [**thaw**](basic-instructions/thaw/src/lib.rs) - Thaw token account via CPI
+- [**close**](basic-instructions/close/src/lib.rs) - Close token account via CPI
+
+## Test
+
+### Requirements
+
+- light cli (install via `npm i -g @lightprotocol/zk-compression-cli@beta`)
+- Solana CLI 2.2.15+
+- Anchor 0.31.1+
+- Rust 1.90.0+
+
+### Build
 
 ```bash
-anchor build
+cargo build-sbf --manifest-path escrow/Cargo.toml
+cargo build-sbf --manifest-path fundraiser/Cargo.toml
+cargo build-sbf --manifest-path token-swap/Cargo.toml
+cargo build-sbf --manifest-path light-token-minter/Cargo.toml
 ```
 
+### Run tests
+
 ```bash
-cargo test-sbf
+# Example programs
+cargo test-sbf -p escrow -- --test-threads=1
+cargo test-sbf -p fundraiser -- --test-threads=1
+cargo test-sbf -p light-token-minter -- --test-threads=1
+cargo test-sbf -p swap_example -- --test-threads=1
+
+# Basic macros
+cargo test-sbf -p counter -- --test-threads=1
+cargo test-sbf -p light-token-macro-create-associated-token-account -- --test-threads=1
+cargo test-sbf -p light-token-macro-create-mint -- --test-threads=1
+cargo test-sbf -p light-token-macro-create-token-account -- --test-threads=1
+cargo test-sbf -p create-and-transfer -- --test-threads=1
+
+# Basic instructions
+cargo test-sbf -p light-token-anchor-approve -- --test-threads=1
+cargo test-sbf -p light-token-anchor-burn -- --test-threads=1
+cargo test-sbf -p light-token-anchor-close -- --test-threads=1
+cargo test-sbf -p light-token-anchor-create-associated-token-account -- --test-threads=1
+cargo test-sbf -p light-token-anchor-create-mint -- --test-threads=1
+cargo test-sbf -p light-token-anchor-create-token-account -- --test-threads=1
+cargo test-sbf -p light-token-anchor-freeze -- --test-threads=1
+cargo test-sbf -p light-token-anchor-mint-to -- --test-threads=1
+cargo test-sbf -p light-token-anchor-revoke -- --test-threads=1
+cargo test-sbf -p light-token-anchor-thaw -- --test-threads=1
+cargo test-sbf -p light-token-anchor-transfer-checked -- --test-threads=1
+cargo test-sbf -p light-token-anchor-transfer-interface -- --test-threads=1
 ```
 
 ## Documentation
 
 Learn more [about Light-Token here](https://www.zkcompression.com/light-token/welcome).
+
+API is in Beta and subject to change.
+Questions or need hands-on support? Join the Developer [Discord](https://discord.com/invite/7cJ8BhAXhu).
\ No newline at end of file
diff --git a/programs/anchor/basic-instructions/create-associated-token-account/src/lib.rs b/programs/anchor/basic-instructions/create-associated-token-account/src/lib.rs
index 9124cef..880e273 100644
--- a/programs/anchor/basic-instructions/create-associated-token-account/src/lib.rs
+++ b/programs/anchor/basic-instructions/create-associated-token-account/src/lib.rs
@@ -9,13 +9,12 @@ declare_id!("35MukgdfpNUbPMhTmEk63ECV8vjgpNVFRH9nP8ovMN58");
 pub mod light_token_anchor_create_associated_token_account {
     use super::*;
 
-    pub fn create_associated_token_account(ctx: Context<CreateAssociatedTokenAccountAccounts>, bump: u8, idempotent: bool) -> Result<()> {
+    pub fn create_associated_token_account(ctx: Context<CreateAssociatedTokenAccountAccounts>, idempotent: bool) -> Result<()> {
         let cpi = CreateAssociatedAccountCpi {
             payer: ctx.accounts.payer.to_account_info(),
             owner: ctx.accounts.owner.to_account_info(),
             mint: ctx.accounts.mint.to_account_info(),
             ata: ctx.accounts.associated_token_account.to_account_info(),
-            bump,
         };
 
         if idempotent {
diff --git a/programs/anchor/basic-instructions/create-associated-token-account/tests/test.rs b/programs/anchor/basic-instructions/create-associated-token-account/tests/test.rs
index 329622b..49ca4c2 100644
--- a/programs/anchor/basic-instructions/create-associated-token-account/tests/test.rs
+++ b/programs/anchor/basic-instructions/create-associated-token-account/tests/test.rs
@@ -75,7 +75,7 @@ async fn test_create_associated_token_account() {
 
     // You can use light, spl, t22 mints to create a light token associated token account.
     // Derive associated token account address and bump
-    let (associated_token_account, associated_token_account_bump) = derive_token_ata(&payer.pubkey(), &mint_pda);
+    let associated_token_account = derive_token_ata(&payer.pubkey(), &mint_pda);
 
     // Call the anchor program to create associated token account
     let compressible_config = config_pda();
@@ -95,7 +95,6 @@ async fn test_create_associated_token_account() {
         }
         .to_account_metas(Some(true)),
         data: CreateAssociatedTokenAccount {
-            bump: associated_token_account_bump,
             idempotent: false,
         }
         .data(),
diff --git a/programs/anchor/basic-instructions/test-utils/src/lib.rs b/programs/anchor/basic-instructions/test-utils/src/lib.rs
index 1116f35..2dfe263 100644
--- a/programs/anchor/basic-instructions/test-utils/src/lib.rs
+++ b/programs/anchor/basic-instructions/test-utils/src/lib.rs
@@ -138,7 +138,7 @@ pub async fn create_associated_token_account_for_owner(
     owner: &Pubkey,
     mint_pda: &Pubkey,
 ) -> Pubkey {
-    let (associated_token_account, _) = derive_token_ata(owner, mint_pda);
+    let associated_token_account = derive_token_ata(owner, mint_pda);
     let create_associated_token_account_ix = CreateAssociatedTokenAccount::new(payer.pubkey(), *owner, *mint_pda)
         .instruction()
         .unwrap();
diff --git a/programs/anchor/basic-instructions/transfer-interface/tests/test.rs b/programs/anchor/basic-instructions/transfer-interface/tests/test.rs
index 2eacc55..b58ebfe 100644
--- a/programs/anchor/basic-instructions/transfer-interface/tests/test.rs
+++ b/programs/anchor/basic-instructions/transfer-interface/tests/test.rs
@@ -165,7 +165,7 @@ async fn test_transfer_spl_to_light() {
 
     // 4. Create Light ATA for destination
     let recipient = Keypair::new();
-    let (dest_ata, _) = derive_token_ata(&recipient.pubkey(), &mint);
+    let dest_ata = derive_token_ata(&recipient.pubkey(), &mint);
     let create_ata_ix = CreateAssociatedTokenAccount::new(payer.pubkey(), recipient.pubkey(), mint)
         .instruction()
         .unwrap();
diff --git a/programs/anchor/basic-macros/counter/Cargo.toml b/programs/anchor/basic-macros/counter/Cargo.toml
index 648c775..a977807 100644
--- a/programs/anchor/basic-macros/counter/Cargo.toml
+++ b/programs/anchor/basic-macros/counter/Cargo.toml
@@ -18,10 +18,9 @@ test-sbf = []
 
 [dependencies]
 anchor-lang = { workspace = true }
-blake3 = { workspace = true }
-light-account = { version = "0.20.0", features = ["anchor"] }
-light-compressed-account = "0.10.1"
-light-sdk = { version = "0.20.0", features = ["anchor", "cpi-context", "v2"] }
+light-account = { workspace = true }
+light-compressed-account = { workspace = true }
+light-sdk = { workspace = true }
 light-hasher = { workspace = true, features = ["solana"] }
 solana-program = { workspace = true }
 solana-pubkey = { workspace = true }
@@ -30,8 +29,8 @@ solana-program-error = { workspace = true }
 solana-msg = { workspace = true }
 
 [dev-dependencies]
-light-program-test = "0.20.0"
-light-client = { version = "0.20.0", features = ["v2", "anchor"] }
+light-program-test = { workspace = true }
+light-client = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 solana-keypair = { workspace = true }
 solana-signer = { workspace = true }
diff --git a/programs/anchor/basic-macros/create-associated-token-account/Cargo.toml b/programs/anchor/basic-macros/create-associated-token-account/Cargo.toml
index b877b6b..01c5ccc 100644
--- a/programs/anchor/basic-macros/create-associated-token-account/Cargo.toml
+++ b/programs/anchor/basic-macros/create-associated-token-account/Cargo.toml
@@ -17,21 +17,16 @@ idl-build = ["anchor-lang/idl-build", "light-sdk/idl-build"]
 [dependencies]
 anchor-lang = { workspace = true }
 light-sdk = { workspace = true }
-light-sdk-types = { workspace = true }
-light-sdk-macros = { workspace = true }
-light-macros = { workspace = true }
-light-compressible = { workspace = true }
-light-compressed-account = { workspace = true }
+light-account = { workspace = true }
 light-hasher = { workspace = true }
 light-token = { workspace = true }
-light-token-types = { workspace = true }
-borsh = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-msg = { workspace = true }
 solana-program-error = { workspace = true }
 solana-account-info = { workspace = true }
 
 [dev-dependencies]
+borsh = { workspace = true }
 light-program-test = { workspace = true }
 light-client = { workspace = true }
 light-token-interface = { workspace = true }
diff --git a/programs/anchor/basic-macros/create-associated-token-account/src/lib.rs b/programs/anchor/basic-macros/create-associated-token-account/src/lib.rs
index 7440aa1..74eff6b 100644
--- a/programs/anchor/basic-macros/create-associated-token-account/src/lib.rs
+++ b/programs/anchor/basic-macros/create-associated-token-account/src/lib.rs
@@ -1,11 +1,11 @@
 #![allow(deprecated)]
 
 use anchor_lang::prelude::*;
-use light_compressible::CreateAccountsProof;
-use light_sdk::derive_light_cpi_signer;
-use light_sdk_macros::{light_program, LightAccounts};
-use light_sdk_types::{CpiSigner, LIGHT_TOKEN_PROGRAM_ID};
-use light_token::instruction::{COMPRESSIBLE_CONFIG_V1, RENT_SPONSOR as LIGHT_TOKEN_RENT_SPONSOR};
+use light_account::{
+    derive_light_cpi_signer, light_program, CreateAccountsProof, CpiSigner, LightAccounts,
+    LIGHT_TOKEN_PROGRAM_ID,
+};
+use light_token::instruction::{LIGHT_TOKEN_CONFIG, LIGHT_TOKEN_RENT_SPONSOR};
 
 declare_id!("CLsn9MTFv97oMTsujRoQAw1u2rSm2HnKtGuWUbbc8Jfn");
 
@@ -29,7 +29,6 @@ pub mod light_token_macro_create_associated_token_account {
 #[derive(AnchorSerialize, AnchorDeserialize, Clone)]
 pub struct CreateAssociatedTokenAccountParams {
     pub create_accounts_proof: CreateAccountsProof,
-    pub associated_token_account_bump: u8,
 }
 
 #[derive(Accounts, LightAccounts)]
@@ -46,12 +45,12 @@ pub struct CreateAssociatedTokenAccount<'info> {
 
     /// CHECK: Validated by light_account macro
     #[account(mut)]
-    #[light_account(init, associated_token::authority = associated_token_account_owner, associated_token::mint = associated_token_account_mint, associated_token::bump = params.associated_token_account_bump)]
+    #[light_account(init, associated_token::authority = associated_token_account_owner, associated_token::mint = associated_token_account_mint)]
     pub associated_token_account: UncheckedAccount<'info>,
 
     /// CHECK: Validated by address constraint
-    #[account(address = COMPRESSIBLE_CONFIG_V1)]
-    pub light_token_compressible_config: AccountInfo<'info>,
+    #[account(address = LIGHT_TOKEN_CONFIG)]
+    pub light_token_config: AccountInfo<'info>,
 
     /// CHECK: Validated by address constraint
     #[account(mut, address = LIGHT_TOKEN_RENT_SPONSOR)]
diff --git a/programs/anchor/basic-macros/create-associated-token-account/tests/test.rs b/programs/anchor/basic-macros/create-associated-token-account/tests/test.rs
index f12d6de..cdbb550 100644
--- a/programs/anchor/basic-macros/create-associated-token-account/tests/test.rs
+++ b/programs/anchor/basic-macros/create-associated-token-account/tests/test.rs
@@ -4,8 +4,8 @@ use light_program_test::{
     program_test::{setup_mock_program_data, LightProgramTest},
     ProgramTestConfig, Rpc,
 };
-use light_sdk_types::LIGHT_TOKEN_PROGRAM_ID;
-use light_token::instruction::{COMPRESSIBLE_CONFIG_V1, RENT_SPONSOR};
+use light_account::{derive_rent_sponsor_pda, LIGHT_TOKEN_PROGRAM_ID};
+use light_token::instruction::{LIGHT_TOKEN_CONFIG, LIGHT_TOKEN_RENT_SPONSOR};
 use solana_instruction::Instruction;
 use solana_signer::Signer;
 use test_utils::create_mint;
@@ -25,11 +25,13 @@ async fn test_create_associated_token_account() {
 
     let program_data_pda = setup_mock_program_data(&mut rpc, &payer, &program_id);
 
+    let (rent_sponsor, _) = derive_rent_sponsor_pda(&program_id);
+
     let (init_config_ix, _config_pda) = InitializeRentFreeConfig::new(
         &program_id,
         &payer.pubkey(),
         &program_data_pda,
-        RENT_SPONSOR,
+        rent_sponsor,
         payer.pubkey(),
     )
     .build();
@@ -44,7 +46,7 @@ async fn test_create_associated_token_account() {
     let associated_token_account_owner = payer.pubkey();
 
     // Derive the associated token account address using Light Token SDK's derivation
-    let (associated_token_account, associated_token_account_bump) = light_token::instruction::derive_token_ata(&associated_token_account_owner, &mint);
+    let associated_token_account = light_token::instruction::derive_token_ata(&associated_token_account_owner, &mint);
 
     // Get proof (no PDA accounts for associated token account-only instruction)
     let proof_result = get_create_accounts_proof(&rpc, &program_id, vec![])
@@ -57,8 +59,8 @@ async fn test_create_associated_token_account() {
         associated_token_account_mint: mint,
         associated_token_account_owner,
         associated_token_account,
-        light_token_compressible_config: COMPRESSIBLE_CONFIG_V1,
-        light_token_rent_sponsor: RENT_SPONSOR,
+        light_token_config: LIGHT_TOKEN_CONFIG,
+        light_token_rent_sponsor: LIGHT_TOKEN_RENT_SPONSOR,
         light_token_program: LIGHT_TOKEN_PROGRAM_ID.into(),
         system_program: solana_sdk::system_program::ID,
     };
@@ -66,7 +68,6 @@ async fn test_create_associated_token_account() {
     let instruction_data = light_token_macro_create_associated_token_account::instruction::CreateAssociatedTokenAccount {
         params: CreateAssociatedTokenAccountParams {
             create_accounts_proof: proof_result.create_accounts_proof,
-            associated_token_account_bump,
         },
     };
 
diff --git a/programs/anchor/basic-macros/create-mint/Cargo.toml b/programs/anchor/basic-macros/create-mint/Cargo.toml
index 615b03d..0e9b216 100644
--- a/programs/anchor/basic-macros/create-mint/Cargo.toml
+++ b/programs/anchor/basic-macros/create-mint/Cargo.toml
@@ -17,16 +17,10 @@ idl-build = ["anchor-lang/idl-build", "light-sdk/idl-build", "light-anchor-spl/i
 [dependencies]
 anchor-lang = { workspace = true }
 light-sdk = { workspace = true }
-light-sdk-types = { workspace = true }
-light-sdk-macros = { workspace = true }
-light-macros = { workspace = true }
-light-compressible = { workspace = true }
-light-compressed-account = { workspace = true }
+light-account = { workspace = true }
 light-hasher = { workspace = true }
 light-token = { workspace = true }
-light-token-types = { workspace = true }
 light-anchor-spl = { workspace = true }
-borsh = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-msg = { workspace = true }
 solana-program-error = { workspace = true }
diff --git a/programs/anchor/basic-macros/create-mint/src/lib.rs b/programs/anchor/basic-macros/create-mint/src/lib.rs
index fa405ad..16fc846 100644
--- a/programs/anchor/basic-macros/create-mint/src/lib.rs
+++ b/programs/anchor/basic-macros/create-mint/src/lib.rs
@@ -1,10 +1,9 @@
 #![allow(deprecated)]
 
 use anchor_lang::prelude::*;
-use light_compressible::CreateAccountsProof;
-use light_sdk::derive_light_cpi_signer;
-use light_sdk_macros::{light_program, LightAccounts};
-use light_sdk_types::CpiSigner;
+use light_account::{
+    derive_light_cpi_signer, light_program, CreateAccountsProof, CpiSigner, LightAccounts,
+};
 
 declare_id!("HVmVqSJyMejBeUigePMSfX4aENJzCGHNxAJuT2PDMPRx");
 
@@ -57,12 +56,12 @@ pub struct CreateMint<'info> {
     /// CHECK: Compression config PDA
     pub compression_config: AccountInfo<'info>,
 
-    /// CHECK: Light Token compressible config
-    pub light_token_compressible_config: AccountInfo<'info>,
+    /// CHECK: Light Token config
+    pub light_token_config: AccountInfo<'info>,
 
     /// CHECK: Rent sponsor
     #[account(mut)]
-    pub rent_sponsor: AccountInfo<'info>,
+    pub light_token_rent_sponsor: AccountInfo<'info>,
 
     /// CHECK: Light Token program
     pub light_token_program: AccountInfo<'info>,
@@ -106,12 +105,12 @@ pub struct CreateMintWithMetadata<'info> {
     /// CHECK: Compression config PDA
     pub compression_config: AccountInfo<'info>,
 
-    /// CHECK: Light Token compressible config
-    pub light_token_compressible_config: AccountInfo<'info>,
+    /// CHECK: Light Token config
+    pub light_token_config: AccountInfo<'info>,
 
     /// CHECK: Rent sponsor
     #[account(mut)]
-    pub rent_sponsor: AccountInfo<'info>,
+    pub light_token_rent_sponsor: AccountInfo<'info>,
 
     /// CHECK: Light Token program
     pub light_token_program: AccountInfo<'info>,
diff --git a/programs/anchor/basic-macros/create-mint/tests/test.rs b/programs/anchor/basic-macros/create-mint/tests/test.rs
index 57a787d..d27998d 100644
--- a/programs/anchor/basic-macros/create-mint/tests/test.rs
+++ b/programs/anchor/basic-macros/create-mint/tests/test.rs
@@ -6,8 +6,8 @@ use light_program_test::{
     program_test::{setup_mock_program_data, LightProgramTest},
     ProgramTestConfig, Rpc,
 };
-use light_sdk_types::LIGHT_TOKEN_PROGRAM_ID;
-use light_token::instruction::{find_mint_address, COMPRESSIBLE_CONFIG_V1, RENT_SPONSOR};
+use light_account::{derive_rent_sponsor_pda, LIGHT_TOKEN_PROGRAM_ID};
+use light_token::instruction::{find_mint_address, LIGHT_TOKEN_CONFIG, LIGHT_TOKEN_RENT_SPONSOR};
 use solana_instruction::Instruction;
 use solana_keypair::Keypair;
 use solana_pubkey::Pubkey;
@@ -26,11 +26,13 @@ async fn setup() -> (light_program_test::LightProgramTest, Keypair, Pubkey, Pubk
 
     let program_data_pda = setup_mock_program_data(&mut rpc, &payer, &program_id);
 
+    let (rent_sponsor, _) = derive_rent_sponsor_pda(&program_id);
+
     let (init_config_ix, config_pda) = InitializeRentFreeConfig::new(
         &program_id,
         &payer.pubkey(),
         &program_data_pda,
-        RENT_SPONSOR,
+        rent_sponsor,
         payer.pubkey(),
     )
     .build();
@@ -69,10 +71,10 @@ async fn test_create_mint() {
         mint_signer: mint_signer_pda,
         mint: mint_pda,
         compression_config: config_pda,
-        light_token_compressible_config: COMPRESSIBLE_CONFIG_V1,
-        rent_sponsor: RENT_SPONSOR,
+        light_token_config: LIGHT_TOKEN_CONFIG,
+        light_token_rent_sponsor: LIGHT_TOKEN_RENT_SPONSOR,
         light_token_program: LIGHT_TOKEN_PROGRAM_ID.into(),
-        light_token_cpi_authority: light_token_types::CPI_AUTHORITY_PDA.into(),
+        light_token_cpi_authority: light_token::constants::LIGHT_TOKEN_CPI_AUTHORITY,
         system_program: solana_sdk::system_program::ID,
     };
 
@@ -141,10 +143,10 @@ async fn test_create_mint_with_metadata() {
         mint_signer: mint_signer_pda,
         mint: mint_pda,
         compression_config: config_pda,
-        light_token_compressible_config: COMPRESSIBLE_CONFIG_V1,
-        rent_sponsor: RENT_SPONSOR,
+        light_token_config: LIGHT_TOKEN_CONFIG,
+        light_token_rent_sponsor: LIGHT_TOKEN_RENT_SPONSOR,
         light_token_program: LIGHT_TOKEN_PROGRAM_ID.into(),
-        light_token_cpi_authority: light_token_types::CPI_AUTHORITY_PDA.into(),
+        light_token_cpi_authority: light_token::constants::LIGHT_TOKEN_CPI_AUTHORITY,
         system_program: solana_sdk::system_program::ID,
     };
 
diff --git a/programs/anchor/basic-macros/create-token-account/Cargo.toml b/programs/anchor/basic-macros/create-token-account/Cargo.toml
index cc6f6c6..8ea38ca 100644
--- a/programs/anchor/basic-macros/create-token-account/Cargo.toml
+++ b/programs/anchor/basic-macros/create-token-account/Cargo.toml
@@ -17,15 +17,9 @@ idl-build = ["anchor-lang/idl-build", "light-sdk/idl-build"]
 [dependencies]
 anchor-lang = { workspace = true }
 light-sdk = { workspace = true }
-light-sdk-types = { workspace = true }
-light-sdk-macros = { workspace = true }
-light-macros = { workspace = true }
-light-compressible = { workspace = true }
-light-compressed-account = { workspace = true }
+light-account = { workspace = true }
 light-hasher = { workspace = true }
 light-token = { workspace = true }
-light-token-types = { workspace = true }
-borsh = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-msg = { workspace = true }
 solana-program-error = { workspace = true }
diff --git a/programs/anchor/basic-macros/create-token-account/src/lib.rs b/programs/anchor/basic-macros/create-token-account/src/lib.rs
index 0223cae..80c4660 100644
--- a/programs/anchor/basic-macros/create-token-account/src/lib.rs
+++ b/programs/anchor/basic-macros/create-token-account/src/lib.rs
@@ -1,11 +1,10 @@
 #![allow(deprecated)]
 
 use anchor_lang::prelude::*;
-use light_compressible::CreateAccountsProof;
-use light_sdk::derive_light_cpi_signer;
-use light_sdk_macros::{light_program, LightAccounts};
-use light_sdk_types::CpiSigner;
-use light_token::instruction::{COMPRESSIBLE_CONFIG_V1, RENT_SPONSOR as LIGHT_TOKEN_RENT_SPONSOR};
+use light_account::{
+    derive_light_cpi_signer, light_program, CreateAccountsProof, CpiSigner, LightAccounts,
+};
+use light_token::instruction::{LIGHT_TOKEN_CONFIG, LIGHT_TOKEN_RENT_SPONSOR};
 
 declare_id!("9p5BUDtVmRRJqp2sN73ZUZDbaYtYvEWuxzrHH3A2ni9y");
 
@@ -45,16 +44,17 @@ pub struct CreateTokenVault<'info> {
     )]
     #[light_account(
         init,
-        token::authority = [VAULT_SEED, self.mint.key()],
+        token::seeds = [VAULT_SEED, self.mint.key()],
         token::mint = mint,
         token::owner = vault_authority,
+        token::owner_seeds = [VAULT_AUTH_SEED],
         token::bump = params.vault_bump
     )]
     pub vault: UncheckedAccount<'info>,
 
     /// CHECK: Validated by address constraint
-    #[account(address = COMPRESSIBLE_CONFIG_V1)]
-    pub light_token_compressible_config: AccountInfo<'info>,
+    #[account(address = LIGHT_TOKEN_CONFIG)]
+    pub light_token_config: AccountInfo<'info>,
 
     /// CHECK: Validated by address constraint
     #[account(mut, address = LIGHT_TOKEN_RENT_SPONSOR)]
diff --git a/programs/anchor/basic-macros/create-token-account/tests/test.rs b/programs/anchor/basic-macros/create-token-account/tests/test.rs
index ee44fba..55be415 100644
--- a/programs/anchor/basic-macros/create-token-account/tests/test.rs
+++ b/programs/anchor/basic-macros/create-token-account/tests/test.rs
@@ -15,11 +15,11 @@ use test_utils::create_mint;
 /// 3. The vault has the correct owner and mint
 #[tokio::test]
 async fn test_create_token_vault() {
-    use light_token::instruction::{COMPRESSIBLE_CONFIG_V1, RENT_SPONSOR};
+    use light_token::instruction::{LIGHT_TOKEN_CONFIG, LIGHT_TOKEN_RENT_SPONSOR};
     use light_token_macro_create_token_account::{
         CreateTokenVaultParams, VAULT_AUTH_SEED, VAULT_SEED,
     };
-    use light_token_types::CPI_AUTHORITY_PDA;
+    use light_token::constants::LIGHT_TOKEN_CPI_AUTHORITY;
 
     let program_id = light_token_macro_create_token_account::ID;
     let config = ProgramTestConfig::new_v2(
@@ -49,9 +49,9 @@ async fn test_create_token_vault() {
         mint,
         vault_authority,
         vault,
-        light_token_compressible_config: COMPRESSIBLE_CONFIG_V1,
-        light_token_rent_sponsor: RENT_SPONSOR,
-        light_token_cpi_authority: CPI_AUTHORITY_PDA.into(),
+        light_token_config: LIGHT_TOKEN_CONFIG,
+        light_token_rent_sponsor: LIGHT_TOKEN_RENT_SPONSOR,
+        light_token_cpi_authority: LIGHT_TOKEN_CPI_AUTHORITY,
         light_token_program: LIGHT_TOKEN_PROGRAM_ID,
         system_program: solana_sdk::system_program::ID,
     };
diff --git a/programs/anchor/create-and-transfer/Cargo.toml b/programs/anchor/create-and-transfer/Cargo.toml
index e7d2da0..b51c8f9 100644
--- a/programs/anchor/create-and-transfer/Cargo.toml
+++ b/programs/anchor/create-and-transfer/Cargo.toml
@@ -15,12 +15,9 @@ idl-build = ["anchor-lang/idl-build", "light-sdk/idl-build"]
 
 [dependencies]
 anchor-lang = { workspace = true }
+light-account = { workspace = true }
 light-sdk = { workspace = true }
-light-sdk-types = { workspace = true }
-light-sdk-macros = { workspace = true }
-light-compressible = { workspace = true }
 light-token = { workspace = true }
-light-token-types = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-msg = { workspace = true }
 solana-program-error = { workspace = true }
diff --git a/programs/anchor/create-and-transfer/src/lib.rs b/programs/anchor/create-and-transfer/src/lib.rs
index fa05a64..de6c886 100644
--- a/programs/anchor/create-and-transfer/src/lib.rs
+++ b/programs/anchor/create-and-transfer/src/lib.rs
@@ -1,8 +1,8 @@
 #![allow(unexpected_cfgs, deprecated)]
 
 use anchor_lang::prelude::*;
-use light_sdk::interface::CreateAccountsProof;
-use light_token::anchor::{derive_light_cpi_signer, light_program, CpiSigner, LightAccounts};
+use light_account::CreateAccountsProof;
+use light_account::{derive_light_cpi_signer, light_program, CpiSigner, LightAccounts};
 use light_token::instruction::TransferInterfaceCpi;
 
 declare_id!("672fL1Nm191MbPoygNM9DRiG2psBELn97XUpGbU3jW7E");
@@ -13,7 +13,6 @@ pub const LIGHT_CPI_SIGNER: CpiSigner =
 #[derive(AnchorSerialize, AnchorDeserialize, Clone)]
 pub struct TransferParams {
     pub create_accounts_proof: CreateAccountsProof,
-    pub dest_associated_token_account_bump: u8,
     pub amount: u64,
     pub decimals: u8,
 }
@@ -65,8 +64,7 @@ pub struct Transfer<'info> {
     #[account(mut)]
     #[light_account(init,
         associated_token::authority = recipient,
-        associated_token::mint = mint,
-        associated_token::bump = params.dest_associated_token_account_bump
+        associated_token::mint = mint
     )]
     pub destination: UncheckedAccount<'info>,
 
@@ -76,11 +74,11 @@ pub struct Transfer<'info> {
     pub system_program: Program<'info, System>,
 
     /// CHECK: Validated by light-token CPI
-    pub light_token_compressible_config: AccountInfo<'info>,
+    pub light_token_config: AccountInfo<'info>,
 
     /// CHECK: Validated by light-token CPI
     #[account(mut)]
-    pub rent_sponsor: AccountInfo<'info>,
+    pub light_token_rent_sponsor: AccountInfo<'info>,
 
     /// CHECK: Validated by light-token CPI
     pub light_token_cpi_authority: AccountInfo<'info>,
diff --git a/programs/anchor/create-and-transfer/tests/test.rs b/programs/anchor/create-and-transfer/tests/test.rs
index 565f299..96b9ddf 100644
--- a/programs/anchor/create-and-transfer/tests/test.rs
+++ b/programs/anchor/create-and-transfer/tests/test.rs
@@ -4,10 +4,11 @@ use light_program_test::{
     program_test::{setup_mock_program_data, LightProgramTest},
     Indexer, ProgramTestConfig, Rpc,
 };
-use light_sdk_types::LIGHT_TOKEN_PROGRAM_ID;
+use light_account::LIGHT_TOKEN_PROGRAM_ID;
 use light_token::instruction::{
-    derive_token_ata, find_mint_address, COMPRESSIBLE_CONFIG_V1, RENT_SPONSOR,
+    derive_token_ata, find_mint_address, LIGHT_TOKEN_CONFIG, LIGHT_TOKEN_RENT_SPONSOR,
 };
+use light_account::derive_rent_sponsor_pda;
 use solana_instruction::Instruction;
 use solana_keypair::Keypair;
 use solana_signer::Signer;
@@ -112,11 +113,13 @@ async fn test_transfer() {
 
     let program_data_pda = setup_mock_program_data(&mut rpc, &payer, &ID);
 
+    let (rent_sponsor, _) = derive_rent_sponsor_pda(&ID);
+
     let (init_config_ix, _config_pda) = InitializeRentFreeConfig::new(
         &ID,
         &payer.pubkey(),
         &program_data_pda,
-        RENT_SPONSOR,
+        rent_sponsor,
         payer.pubkey(),
     )
     .build();
@@ -136,7 +139,7 @@ async fn test_transfer() {
     println!("Mint created at: {}", mint_pda);
 
     let sender = Keypair::new();
-    let (sender_associated_token_account, _sender_associated_token_account_bump) = derive_token_ata(&sender.pubkey(), &mint_pda);
+    let sender_associated_token_account = derive_token_ata(&sender.pubkey(), &mint_pda);
 
     let create_sender_associated_token_account_ix =
         light_token::instruction::CreateAssociatedTokenAccount::new(
@@ -157,7 +160,7 @@ async fn test_transfer() {
     println!("Minted {} tokens to sender: {}", mint_amount, sender_associated_token_account);
 
     let recipient = Keypair::new();
-    let (recipient_associated_token_account, recipient_associated_token_account_bump) = derive_token_ata(&recipient.pubkey(), &mint_pda);
+    let recipient_associated_token_account = derive_token_ata(&recipient.pubkey(), &mint_pda);
 
     let transfer_proof_result = get_create_accounts_proof(&rpc, &ID, vec![])
         .await
@@ -172,9 +175,9 @@ async fn test_transfer() {
         destination: recipient_associated_token_account,
         light_token_program: LIGHT_TOKEN_PROGRAM_ID.into(),
         system_program: solana_sdk::system_program::ID,
-        light_token_compressible_config: COMPRESSIBLE_CONFIG_V1,
-        rent_sponsor: RENT_SPONSOR,
-        light_token_cpi_authority: light_token_types::CPI_AUTHORITY_PDA.into(),
+        light_token_config: LIGHT_TOKEN_CONFIG,
+        light_token_rent_sponsor: LIGHT_TOKEN_RENT_SPONSOR,
+        light_token_cpi_authority: light_token::constants::LIGHT_TOKEN_CPI_AUTHORITY,
     };
 
     let transfer_amount: u64 = 500_000_000; // 0.5 tokens
@@ -190,7 +193,6 @@ async fn test_transfer() {
         data: create_and_transfer::instruction::Transfer {
             params: TransferParams {
                 create_accounts_proof: transfer_proof_result.create_accounts_proof,
-                dest_associated_token_account_bump: recipient_associated_token_account_bump,
                 amount: transfer_amount,
                 decimals,
             },