chore: remove sdk deps from programs, add detection to lint

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

@@ -2,6 +2,22 @@ use light_hasher::hash_to_field_size::hashv_to_bn254_field_size_be_const_array;
 
 use crate::{CompressedAccountError, Pubkey};
 
+/// A seed used to derive compressed account addresses.
+#[derive(Debug, PartialEq, Clone, Copy)]
+pub struct AddressSeed(pub [u8; 32]);
+
+impl From<[u8; 32]> for AddressSeed {
+    fn from(value: [u8; 32]) -> Self {
+        AddressSeed(value)
+    }
+}
+
+impl From<AddressSeed> for [u8; 32] {
+    fn from(address_seed: AddressSeed) -> Self {
+        address_seed.0
+    }
+}
+
 pub fn derive_address_legacy(
     merkle_tree_pubkey: &Pubkey,
     seed: &[u8; 32],

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

@@ -1,11 +1,20 @@
 use light_macros::pubkey_array;
 
+/// ID of the account-compression program.
 pub const ACCOUNT_COMPRESSION_PROGRAM_ID: [u8; 32] =
     pubkey_array!("compr6CUsB5m2jS4Y3831ztGSTnDpnKJTKS95d64XVq");
-pub const SYSTEM_PROGRAM_ID: [u8; 32] =
+/// ID of the light-system program.
+pub const LIGHT_SYSTEM_PROGRAM_ID: [u8; 32] =
     pubkey_array!("SySTEM1eSU2p4BGQfQpimFEWWSC1XDFeun3Nqzz3rT7");
+#[deprecated(since = "0.9.0", note = "Use LIGHT_SYSTEM_PROGRAM_ID instead")]
+pub const SYSTEM_PROGRAM_ID: [u8; 32] = LIGHT_SYSTEM_PROGRAM_ID;
 pub const REGISTERED_PROGRAM_PDA: [u8; 32] =
     pubkey_array!("35hkDgaAKwMCaxRz2ocSZ6NaUrtKkyNqU6c4RV3tYJRh");
+pub const ACCOUNT_COMPRESSION_AUTHORITY_PDA: [u8; 32] =
+    pubkey_array!("HwXnGK3tPkkVY6P439H2p68AxpeuWXd5PcrAxFpbmfbA");
+/// Seed of the CPI authority.
+pub const CPI_AUTHORITY_PDA_SEED: &[u8] = b"cpi_authority";
+
 pub const CREATE_CPI_CONTEXT_ACCOUNT: [u8; 8] = [233, 112, 71, 66, 121, 33, 178, 188];
 
 pub const ADDRESS_MERKLE_TREE_ACCOUNT_DISCRIMINATOR: [u8; 8] = [11, 161, 175, 9, 212, 229, 73, 73];

program-libs/compressed-account/src/instruction_data/data.rs

@@ -172,6 +172,53 @@ impl NewAddressParamsAssignedPacked {
     }
 }
 
+/// Packed address tree info for instruction data.
+/// Contains indices to address tree accounts and root index.
+#[repr(C)]
+#[cfg_attr(
+    all(feature = "std", feature = "anchor"),
+    derive(anchor_lang::AnchorDeserialize, anchor_lang::AnchorSerialize)
+)]
+#[cfg_attr(
+    not(feature = "anchor"),
+    derive(borsh::BorshDeserialize, borsh::BorshSerialize)
+)]
+#[derive(Debug, Clone, Copy, PartialEq, Default, ZeroCopyMut, light_zero_copy::ZeroCopy)]
+pub struct PackedAddressTreeInfo {
+    pub address_merkle_tree_pubkey_index: u8,
+    pub address_queue_pubkey_index: u8,
+    pub root_index: u16,
+}
+
+impl PackedAddressTreeInfo {
+    pub fn into_new_address_params_packed(
+        self,
+        seed: crate::address::AddressSeed,
+    ) -> NewAddressParamsPacked {
+        NewAddressParamsPacked {
+            address_merkle_tree_account_index: self.address_merkle_tree_pubkey_index,
+            address_queue_account_index: self.address_queue_pubkey_index,
+            address_merkle_tree_root_index: self.root_index,
+            seed: seed.0,
+        }
+    }
+
+    pub fn into_new_address_params_assigned_packed(
+        self,
+        seed: crate::address::AddressSeed,
+        assigned_account_index: Option<u8>,
+    ) -> NewAddressParamsAssignedPacked {
+        NewAddressParamsAssignedPacked {
+            address_merkle_tree_account_index: self.address_merkle_tree_pubkey_index,
+            address_queue_account_index: self.address_queue_pubkey_index,
+            address_merkle_tree_root_index: self.root_index,
+            seed: seed.0,
+            assigned_account_index: assigned_account_index.unwrap_or_default(),
+            assigned_to_account: assigned_account_index.is_some(),
+        }
+    }
+}
+
 #[cfg_attr(
     all(feature = "std", feature = "anchor"),
     derive(anchor_lang::AnchorDeserialize, anchor_lang::AnchorSerialize)

program-libs/compressible/Cargo.toml

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

program-libs/compressible/src/lib.rs

@@ -8,8 +8,9 @@ pub mod rent;
 use anchor_lang::{AnchorDeserialize, AnchorSerialize};
 #[cfg(not(feature = "anchor"))]
 use borsh::{BorshDeserialize as AnchorDeserialize, BorshSerialize as AnchorSerialize};
-use light_compressed_account::instruction_data::compressed_proof::ValidityProof;
-use light_sdk_types::instruction::PackedAddressTreeInfo;
+use light_compressed_account::instruction_data::{
+    compressed_proof::ValidityProof, data::PackedAddressTreeInfo,
+};
 
 /// Proof data for instruction params when creating new compressed accounts.
 /// Used in the INIT flow - pass directly to instruction data.

programs/compressed-token/program/Cargo.toml

@@ -50,15 +50,13 @@ light-zero-copy = { workspace = true, features = ["mut", "std", "derive"] }
 zerocopy = { workspace = true }
 anchor-compressed-token = { path = "../anchor", features = ["cpi"] }
 light-account-checks = { workspace = true, features = ["solana", "pinocchio", "msg"] }
-light-sdk = { workspace = true }
 borsh = { workspace = true }
-light-sdk-types = { workspace = true }
 light-compressible = { workspace = true, features = ["pinocchio"] }
+light-macros = { workspace = true }
 solana-pubkey = { workspace = true }
 arrayvec = { workspace = true }
 tinyvec = { workspace = true }
 pinocchio = { workspace = true, features = ["std"] }
-light-sdk-pinocchio = { workspace = true }
 light-token-interface = { workspace = true, features = ["anchor"] }
 light-array-map = { workspace = true }
 pinocchio-pubkey = { workspace = true }

programs/compressed-token/program/src/compressed_token/mint_action/actions/mint_to.rs

@@ -1,8 +1,9 @@
 use anchor_compressed_token::ErrorCode;
 use anchor_lang::solana_program::program_error::ProgramError;
-use light_compressed_account::Pubkey;
+use light_compressed_account::{
+    instruction_data::data::ZOutputCompressedAccountWithPackedContextMut, Pubkey,
+};
 use light_program_profiler::profile;
-use light_sdk_pinocchio::instruction::ZOutputCompressedAccountWithPackedContextMut;
 use light_token_interface::{
     hash_cache::HashCache, instructions::mint_action::ZMintToCompressedAction, state::Mint,
 };

programs/compressed-token/program/src/compressed_token/mint_action/mint_input.rs

@@ -1,9 +1,10 @@
 use anchor_lang::solana_program::program_error::ProgramError;
 use borsh::BorshSerialize;
-use light_compressed_account::instruction_data::with_readonly::ZInAccountMut;
+use light_compressed_account::{
+    compressed_account::PackedMerkleContext, instruction_data::with_readonly::ZInAccountMut,
+};
 use light_hasher::{sha256::Sha256BE, Hasher};
 use light_program_profiler::profile;
-use light_sdk::instruction::PackedMerkleContext;
 use light_token_interface::state::Mint;
 use light_zero_copy::U16;
 

programs/compressed-token/program/src/compressed_token/mint_action/processor.rs

@@ -1,7 +1,9 @@
 use anchor_compressed_token::{is_idempotent_early_exit, ErrorCode};
 use anchor_lang::prelude::ProgramError;
-use light_compressed_account::instruction_data::with_readonly::InstructionDataInvokeCpiWithReadOnly;
-use light_sdk::instruction::PackedMerkleContext;
+use light_compressed_account::{
+    compressed_account::PackedMerkleContext,
+    instruction_data::with_readonly::InstructionDataInvokeCpiWithReadOnly,
+};
 use light_token_interface::{
     hash_cache::HashCache, instructions::mint_action::MintActionCompressedInstructionData,
     state::Mint, TokenError,

programs/compressed-token/program/src/compressed_token/transfer2/compression/spl.rs

@@ -1,8 +1,8 @@
 use anchor_compressed_token::ErrorCode;
 use anchor_lang::prelude::ProgramError;
 use light_account_checks::packed_accounts::ProgramPackedAccounts;
+use light_compressed_account::constants::CPI_AUTHORITY_PDA_SEED;
 use light_program_profiler::profile;
-use light_sdk_types::CPI_AUTHORITY_PDA_SEED;
 use light_token_interface::{
     instructions::transfer2::{ZCompression, ZCompressionMode},
     is_valid_spl_interface_pda,

programs/compressed-token/program/src/lib.rs

@@ -1,7 +1,8 @@
 use std::mem::ManuallyDrop;
 
 use anchor_lang::solana_program::program_error::ProgramError;
-use light_sdk::{cpi::CpiSigner, derive_light_cpi_signer};
+use light_compressed_account::CpiSigner;
+use light_macros::derive_light_cpi_signer;
 use light_token_interface::LIGHT_TOKEN_PROGRAM_ID;
 use pinocchio::{account_info::AccountInfo, msg};
 

programs/compressed-token/program/src/shared/cpi.rs

@@ -1,11 +1,11 @@
 use std::mem::MaybeUninit;
 
 use anchor_lang::solana_program::program_error::ProgramError;
-use light_program_profiler::profile;
-use light_sdk_types::{
+use light_compressed_account::constants::{
     ACCOUNT_COMPRESSION_AUTHORITY_PDA, ACCOUNT_COMPRESSION_PROGRAM_ID, CPI_AUTHORITY_PDA_SEED,
     LIGHT_SYSTEM_PROGRAM_ID, REGISTERED_PROGRAM_PDA,
 };
+use light_program_profiler::profile;
 use pinocchio::{
     account_info::{AccountInfo, BorrowState},
     cpi::{invoke_signed_unchecked, MAX_CPI_ACCOUNTS},

programs/compressed-token/program/src/shared/mint_to_token_pool.rs

@@ -1,6 +1,6 @@
 use anchor_lang::solana_program::program_error::ProgramError;
+use light_compressed_account::constants::CPI_AUTHORITY_PDA_SEED;
 use light_program_profiler::profile;
-use light_sdk_types::CPI_AUTHORITY_PDA_SEED;
 use pinocchio::{
     account_info::AccountInfo,
     instruction::{AccountMeta, Instruction, Seed, Signer},

programs/compressed-token/program/tests/mint.rs

@@ -171,7 +171,7 @@ fn test_rnd_create_compressed_mint_account() {
         if parsed_instruction_data.create_mint.is_none() {
             let input_account = &mut cpi_instruction_struct.input_compressed_accounts[0];
 
-            use light_sdk::instruction::PackedMerkleContext;
+            use light_compressed_account::compressed_account::PackedMerkleContext;
             let merkle_context = PackedMerkleContext {
                 merkle_tree_pubkey_index,
                 queue_pubkey_index,

programs/compressed-token/program/tests/token_input.rs

@@ -3,8 +3,9 @@ use anchor_lang::prelude::*;
 use borsh::{BorshDeserialize, BorshSerialize};
 use light_account_checks::account_info::test_account_info::pinocchio::get_account_info;
 use light_array_map::ArrayMap;
-use light_compressed_account::instruction_data::with_readonly::{
-    InAccount, InstructionDataInvokeCpiWithReadOnly,
+use light_compressed_account::{
+    compressed_account::PackedMerkleContext,
+    instruction_data::with_readonly::{InAccount, InstructionDataInvokeCpiWithReadOnly},
 };
 use light_compressed_token::{
     constants::{
@@ -19,7 +20,6 @@ use light_compressed_token::{
         token_input::set_input_compressed_account,
     },
 };
-use light_sdk::instruction::PackedMerkleContext;
 use light_token_interface::{
     hash_cache::HashCache, instructions::transfer2::MultiInputTokenDataWithContext,
     state::CompressedTokenAccountState,

scripts/check-dependency-constraints.sh

@@ -0,0 +1,93 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Check that program-libs and programs do not depend on sdk-libs crates
+# This enforces the architectural constraint that program-libs and programs
+# are lower-level and should not depend on higher-level sdk-libs.
+
+echo "Checking dependency constraints..."
+
+# SDK-libs crates that program-libs and programs must NOT depend on
+SDK_LIBS_CRATES=(
+    "light-sdk"
+    "light-sdk-types"
+    "light-sdk-macros"
+    "light-sdk-pinocchio"
+    "light-token"
+    "light-token-types"
+    "light-client"
+    "light-program-test"
+    "light-event"
+    "light-prover-client"
+    "photon-api"
+)
+
+# Crates in program-libs that should not depend on sdk-libs
+PROGRAM_LIBS_CRATES=(
+    "light-account-checks"
+    "light-batched-merkle-tree"
+    "light-bloom-filter"
+    "light-compressed-account"
+    "light-compressible"
+    "light-concurrent-merkle-tree"
+    "light-token-interface"
+    "light-hash-set"
+    "light-hasher"
+    "light-indexed-merkle-tree"
+    "light-macros"
+    "light-merkle-tree-metadata"
+    "light-verifier"
+    "light-zero-copy"
+    "light-zero-copy-derive"
+    "light-heap"
+    "light-array-map"
+    "light-indexed-array"
+    "aligned-sized"
+)
+
+# Programs that should not depend on sdk-libs
+PROGRAM_CRATES=(
+    "account-compression"
+    "light-compressed-token"
+    "light-registry"
+    "light-system-program"
+)
+
+check_no_sdk_deps() {
+    local crate="$1"
+    local tree_output
+    tree_output=$(cargo tree -p "$crate" --edges normal 2>/dev/null)
+
+    for sdk_crate in "${SDK_LIBS_CRATES[@]}"; do
+        if echo "$tree_output" | grep -q " ${sdk_crate} v"; then
+            echo "ERROR: $crate depends on sdk-libs crate: $sdk_crate"
+            return 1
+        fi
+    done
+    return 0
+}
+
+CONSTRAINT_FAILED=0
+
+echo "Checking program-libs crates do not depend on sdk-libs..."
+for crate in "${PROGRAM_LIBS_CRATES[@]}"; do
+    if ! check_no_sdk_deps "$crate"; then
+        CONSTRAINT_FAILED=1
+    fi
+done
+
+echo "Checking programs do not depend on sdk-libs..."
+for crate in "${PROGRAM_CRATES[@]}"; do
+    if ! check_no_sdk_deps "$crate"; then
+        CONSTRAINT_FAILED=1
+    fi
+done
+
+if [ "$CONSTRAINT_FAILED" -eq 1 ]; then
+    echo ""
+    echo "FAILED: Some program-libs or programs depend on sdk-libs crates."
+    echo "This is not allowed. program-libs and programs must only depend on other program-libs or external crates."
+    exit 1
+fi
+
+echo "All dependency constraints satisfied."

scripts/lint.sh

@@ -7,6 +7,9 @@ npx nx run-many --target=lint --all
 cargo +nightly fmt --all -- --check
 cargo clippy --workspace --all-features --all-targets -- -D warnings
 
+# Check that program-libs and programs don't depend on sdk-libs
+./scripts/check-dependency-constraints.sh
+
 echo "Testing feature combinations..."
 
 # Test no-default-features for all library crates

sdk-libs/event/src/parse.rs

@@ -4,8 +4,8 @@ use light_compressed_account::{
         CompressedAccount, CompressedAccountData, PackedCompressedAccountWithMerkleContext,
     },
     constants::{
-        ACCOUNT_COMPRESSION_PROGRAM_ID, CREATE_CPI_CONTEXT_ACCOUNT, REGISTERED_PROGRAM_PDA,
-        SYSTEM_PROGRAM_ID,
+        ACCOUNT_COMPRESSION_PROGRAM_ID, CREATE_CPI_CONTEXT_ACCOUNT, LIGHT_SYSTEM_PROGRAM_ID,
+        REGISTERED_PROGRAM_PDA,
     },
     discriminators::*,
     instruction_data::{
@@ -253,7 +253,7 @@ fn wrap_program_ids(
         let discriminator: [u8; 8] = instruction[0..8].try_into().unwrap();
         if program_id == &Pubkey::default() {
             vec.push(ProgramId::SolanaSystem);
-        } else if program_id == &SYSTEM_PROGRAM_ID {
+        } else if program_id == &LIGHT_SYSTEM_PROGRAM_ID {
             if discriminator == CREATE_CPI_CONTEXT_ACCOUNT {
                 vec.push(ProgramId::Unknown);
             } else {