feat: add support for additional account directories in setup command and related functions

Author: sergeytimoshin

cli/src/commands/test-validator/index.ts

@@ -163,6 +163,13 @@ class SetupCommand extends Command {
       default: true,
       allowNo: true,
     }),
+    "account-dir": Flags.string({
+      description:
+        "Additional directory containing account JSON files to preload. Can be specified multiple times.",
+      required: false,
+      multiple: true,
+      summary: "Usage: --account-dir <path/to/accounts/>",
+    }),
   };
 
   validatePrograms(
@@ -299,6 +306,7 @@ class SetupCommand extends Command {
         verbose: flags.verbose,
         skipReset: flags["skip-reset"],
         useSurfpool: flags["use-surfpool"],
+        additionalAccountDirs: flags["account-dir"],
       });
       this.log("\nSetup tasks completed successfully \x1b[32m✔\x1b[0m");
     }

cli/src/utils/initTestEnv.ts

@@ -158,6 +158,7 @@ export async function initTestEnv({
   skipReset,
   useSurfpool,
   compressiblePdaPrograms,
+  additionalAccountDirs,
 }: {
   additionalPrograms?: { address: string; path: string }[];
   upgradeablePrograms?: {
@@ -184,6 +185,7 @@ export async function initTestEnv({
   skipReset?: boolean;
   useSurfpool?: boolean;
   compressiblePdaPrograms?: string[];
+  additionalAccountDirs?: string[];
 }) {
   if (useSurfpool) {
     // For surfpool we can await startTestValidator because spawnBinary returns
@@ -202,6 +204,7 @@ export async function initTestEnv({
       verbose,
       skipReset,
       useSurfpool,
+      additionalAccountDirs,
     });
     // Surfpool only supports JSON-RPC POST, not GET /health.
     await confirmRpcReadiness(`http://127.0.0.1:${rpcPort}`);
@@ -220,6 +223,7 @@ export async function initTestEnv({
       verbose,
       skipReset,
       useSurfpool,
+      additionalAccountDirs,
     });
     await waitForServers([{ port: rpcPort, path: "/health" }]);
     await confirmServerStability(`http://127.0.0.1:${rpcPort}/health`);
@@ -503,6 +507,7 @@ export async function getSurfpoolArgs({
   rpcPort,
   gossipHost,
   downloadBinaries = true,
+  additionalAccountDirs,
 }: {
   additionalPrograms?: { address: string; path: string }[];
   upgradeablePrograms?: {
@@ -514,6 +519,7 @@ export async function getSurfpoolArgs({
   rpcPort?: number;
   gossipHost?: string;
   downloadBinaries?: boolean;
+  additionalAccountDirs?: string[];
 }): Promise<Array<string>> {
   const dirPath = programsDirPath();
 
@@ -563,6 +569,13 @@ export async function getSurfpoolArgs({
     args.push("--account-dir", accountsPath);
   }
 
+  // Load additional account directories
+  if (additionalAccountDirs) {
+    for (const accountDir of additionalAccountDirs) {
+      args.push("--account-dir", path.resolve(accountDir));
+    }
+  }
+
   return args;
 }
 
@@ -658,6 +671,7 @@ export async function startTestValidator({
   verbose,
   skipReset,
   useSurfpool,
+  additionalAccountDirs,
 }: {
   additionalPrograms?: { address: string; path: string }[];
   upgradeablePrograms?: {
@@ -675,6 +689,7 @@ export async function startTestValidator({
   verbose?: boolean;
   skipReset?: boolean;
   useSurfpool?: boolean;
+  additionalAccountDirs?: string[];
 }) {
   if (useSurfpool) {
     const command = await ensureSurfpoolBinary();
@@ -684,6 +699,7 @@ export async function startTestValidator({
       skipSystemAccounts,
       rpcPort,
       gossipHost,
+      additionalAccountDirs,
     });
 
     await killTestValidator(rpcPort);

forester/src/compressible/pda/compressor.rs

@@ -105,17 +105,6 @@ impl<R: Rpc + Indexer> PdaCompressor<R> {
             )
         })?;
 
-        /*
-             // Verify PDA derivation matches (mirrors LightConfig::load_checked)
-        let (expected_pda, _) = LightConfig::derive_pda(program_id, config.config_bump);
-        if expected_pda != config_pda {
-            return Err(anyhow::anyhow!(
-                "Config PDA derivation mismatch. Expected: {}. Found: {}",
-                expected_pda,
-                config_pda
-            ));
-        }
-        */
         let rent_sponsor = config.rent_sponsor;
         let compression_authority = config.compression_authority;
         let address_tree = *config

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

@@ -6,6 +6,9 @@ pub const ACCOUNT_COMPRESSION_PROGRAM_ID: [u8; 32] =
 /// ID of the light-system program.
 pub const LIGHT_SYSTEM_PROGRAM_ID: [u8; 32] =
     pubkey_array!("SySTEM1eSU2p4BGQfQpimFEWWSC1XDFeun3Nqzz3rT7");
+/// ID of the light-registry program.
+pub const LIGHT_REGISTRY_PROGRAM_ID: [u8; 32] =
+    pubkey_array!("Lighton6oQpVkeewmo2mcPTQQp7kYHr4fWpAgJyEmDX");
 #[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] =