@lightprotocol/zk-compression-cli 0.10.0 → 0.15.0

package/dist/utils/initTestEnv.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.stopTestEnv = stopTestEnv;
 exports.initTestEnv = initTestEnv;
 exports.initTestEnvIfNeeded = initTestEnvIfNeeded;
+exports.programsDirPath = programsDirPath;
+exports.programFilePath = programFilePath;
 exports.getSolanaArgs = getSolanaArgs;
 exports.startTestValidator = startTestValidator;
 exports.killTestValidator = killTestValidator;
@@ -14,9 +17,33 @@ const psp_utils_1 = require("../psp-utils");
 const process_1 = require("./process");
 const processProverServer_1 = require("./processProverServer");
 const processPhotonIndexer_1 = require("./processPhotonIndexer");
-const processForester_1 = require("./processForester");
-async function initTestEnv({ additionalPrograms, skipSystemAccounts, indexer = true, prover = true, forester = true, rpcPort = 8899, indexerPort = 8784, proverPort = 3001, gossipHost = "127.0.0.1", proveCompressedAccounts = true, proveNewAddresses = false, checkPhotonVersion = true, photonDatabaseUrl, limitLedgerSize, }) {
-    console.log("Performing setup tasks...\n");
+async function stopTestEnv(options) {
+    const processesToKill = [
+        { name: "photon", condition: options.indexer, killFunction: processPhotonIndexer_1.killIndexer },
+        { name: "prover", condition: options.prover, killFunction: processProverServer_1.killProver },
+        {
+            name: "test-validator",
+            condition: true,
+            killFunction: killTestValidator,
+        },
+    ];
+    const killPromises = processesToKill
+        .filter((process) => process.condition)
+        .map(async (process) => {
+        try {
+            if (process.killFunction) {
+                await process.killFunction();
+            }
+            console.log(`${process.name} stopped successfully.`);
+        }
+        catch (error) {
+            console.error(`Failed to stop ${process.name}:`, error);
+        }
+    });
+    await Promise.all(killPromises);
+    console.log("All specified processes and validator stopped.");
+}
+async function initTestEnv({ additionalPrograms, skipSystemAccounts, indexer = true, prover = true, rpcPort = 8899, indexerPort = 8784, proverPort = 3001, gossipHost = "127.0.0.1", proveCompressedAccounts = true, proveNewAddresses = false, checkPhotonVersion = true, photonDatabaseUrl, limitLedgerSize, }) {
     const initAccounts = async () => {
         const anchorProvider = await (0, utils_1.setAnchorProvider)();
         const payer = await (0, utils_1.getPayer)();
@@ -49,11 +76,8 @@ async function initTestEnv({ additionalPrograms, skipSystemAccounts, indexer = t
         (0, utils_1.setConfig)(config);
         await (0, processProverServer_1.startProver)(proverPort, proveCompressedAccounts, proveNewAddresses);
     }
-    if (forester) {
-        await (0, processForester_1.startForester)();
-    }
 }
-async function initTestEnvIfNeeded({ additionalPrograms, skipSystemAccounts, indexer = false, prover = false, forester = false, } = {}) {
+async function initTestEnvIfNeeded({ additionalPrograms, skipSystemAccounts, indexer = false, prover = false, } = {}) {
     try {
         const anchorProvider = await (0, utils_1.setAnchorProvider)();
         // this request will fail if there is no local test validator running
@@ -67,7 +91,6 @@ async function initTestEnvIfNeeded({ additionalPrograms, skipSystemAccounts, ind
             skipSystemAccounts,
             indexer,
             prover,
-            forester,
         });
     }
 }

package/dist/utils/process.d.ts

@@ -22,7 +22,7 @@ export declare function executeCommand({ command, args, additionalPath, logFile,
  * @example const output = await execute("ls -alh");
  */
 export declare function execute(command: string): Promise<string>;
-export declare function spawnBinary(command: string, args?: string[]): void;
+export declare function spawnBinary(command: string, args?: string[]): import("child_process").ChildProcess;
 export declare function waitForServers(servers: {
     port: number;
     path: string;

package/dist/utils/process.js

@@ -111,20 +111,33 @@ async function execute(command) {
 function spawnBinary(command, args = []) {
     const logDir = "test-ledger";
     const binaryName = path_1.default.basename(command);
-    const dir = path_1.default.join(__dirname, logDir);
-    if (!fs_1.default.existsSync(dir)) {
-        fs_1.default.mkdirSync(dir);
+    const dir = path_1.default.join(__dirname, "../..", logDir);
+    try {
+        if (!fs_1.default.existsSync(dir)) {
+            fs_1.default.mkdirSync(dir, { recursive: true });
+        }
+        const logPath = path_1.default.join(dir, `${binaryName}.log`);
+        const out = fs_1.default.openSync(logPath, "a");
+        const err = fs_1.default.openSync(logPath, "a");
+        const spawnedProcess = (0, child_process_1.spawn)(command, args, {
+            stdio: ["ignore", out, err],
+            shell: false,
+            detached: true,
+        });
+        spawnedProcess.on("close", (code) => {
+            console.log(`${binaryName} process exited with code ${code}`);
+        });
+        return spawnedProcess;
+    }
+    catch (error) {
+        if (error instanceof Error) {
+            console.error(`Error spawning binary: ${error.message}`);
+        }
+        else {
+            console.error(`An unknown error occurred while spawning binary`);
+        }
+        throw error;
     }
-    const out = fs_1.default.openSync(`${logDir}/${binaryName}.log`, "a");
-    const err = fs_1.default.openSync(`${logDir}/${binaryName}.log`, "a");
-    const spawnedProcess = (0, child_process_1.spawn)(command, args, {
-        stdio: ["ignore", out, err],
-        shell: false,
-        detached: true,
-    });
-    spawnedProcess.on("close", (code) => {
-        console.log(`${binaryName} process exited with code ${code}`);
-    });
 }
 async function waitForServers(servers) {
     const opts = {

package/dist/utils/processPhotonIndexer.d.ts

@@ -1 +1,2 @@
 export declare function startIndexer(rpcUrl: string, indexerPort: number, checkPhotonVersion?: boolean, photonDatabaseUrl?: string): Promise<void>;
+export declare function killIndexer(): Promise<void>;

package/dist/utils/processPhotonIndexer.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startIndexer = startIndexer;
+exports.killIndexer = killIndexer;
 const tslib_1 = require("tslib");
 const which_1 = tslib_1.__importDefault(require("which"));
 const process_1 = require("./process");

package/dist/utils/processProverServer.d.ts

@@ -1,3 +1,4 @@
 export declare function killProver(): Promise<void>;
 export declare function startProver(proverPort: number, proveCompressedAccounts: boolean, proveNewAddresses: boolean): Promise<void>;
 export declare function getProverNameByArch(): string;
+export declare function getProverPathByArch(): string;

package/dist/utils/processProverServer.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.killProver = killProver;
 exports.startProver = startProver;
 exports.getProverNameByArch = getProverNameByArch;
+exports.getProverPathByArch = getProverPathByArch;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const process_1 = require("./process");
@@ -28,7 +29,7 @@ async function startProver(proverPort, proveCompressedAccounts, proveNewAddresse
     args.push("--keys-dir", keysDir);
     args.push("--prover-address", `0.0.0.0:${proverPort}`);
     console.log("Starting prover...");
-    (0, process_1.spawnBinary)(getProverNameByArch(), args);
+    (0, process_1.spawnBinary)(getProverPathByArch(), args);
     await (0, process_1.waitForServers)([{ port: proverPort, path: "/" }]);
     console.log("Prover started successfully!");
 }
@@ -42,6 +43,10 @@ function getProverNameByArch() {
     if (platform.toString() === "windows") {
         binaryName += ".exe";
     }
+    return binaryName;
+}
+function getProverPathByArch() {
+    let binaryName = getProverNameByArch();
     // We need to provide the full path to the binary because it's not in the PATH.
     const binDir = path_1.default.join(__dirname, "../..", "bin");
     binaryName = path_1.default.join(binDir, binaryName);