@lightprotocol/zk-compression-cli 0.27.1-alpha.1 → 0.27.1-alpha.11

package/dist/utils/processProverServer.js

@@ -1,103 +1,84 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.killProver = killProver;
-exports.isProverRunningWithFlags = isProverRunningWithFlags;
 exports.startProver = startProver;
 exports.getProverNameByArch = getProverNameByArch;
 exports.getProverPathByArch = getProverPathByArch;
 exports.healthCheck = healthCheck;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
+const os_1 = tslib_1.__importDefault(require("os"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const child_process_1 = require("child_process");
 const process_1 = require("./process");
 const constants_1 = require("./constants");
-const find_process_1 = tslib_1.__importDefault(require("find-process"));
-const KEYS_DIR = "proving-keys/";
+const downloadProverBinary_1 = require("./downloadProverBinary");
+const LIGHT_CONFIG_DIR = path_1.default.join(os_1.default.homedir(), ".config", "light");
+const PROVER_BIN_DIR = path_1.default.join(LIGHT_CONFIG_DIR, "bin");
+const KEYS_DIR = path_1.default.join(LIGHT_CONFIG_DIR, "proving-keys");
 async function killProver() {
     await (0, process_1.killProcess)(getProverNameByArch());
     await (0, process_1.killProcess)(constants_1.LIGHT_PROVER_PROCESS_NAME);
 }
-async function isProverRunningWithFlags(runMode, circuits, proverPort, redisUrl) {
-    // Use find-process to get prover processes by name pattern
-    const proverProcesses = await (0, find_process_1.default)("name", "prover-");
-    const expectedArgs = [];
-    if (runMode) {
-        expectedArgs.push("--run-mode", runMode);
+/**
+ * Gets the version of the installed prover binary
+ * Returns null if the binary doesn't exist or version command fails
+ */
+function getInstalledProverVersion() {
+    const binaryPath = getProverPathByArch();
+    if (!fs_1.default.existsSync(binaryPath)) {
+        return null;
+    }
+    try {
+        const output = (0, child_process_1.execSync)(`"${binaryPath}" version`, {
+            encoding: "utf-8",
+            timeout: 5000,
+        }).trim();
+        // Extract version number (handles "v2.0.6", "light-prover v2.0.6", "2.0.6", etc.)
+        const match = output.match(/(\d+\.\d+\.\d+)/);
+        return match ? match[1] : null;
+    }
+    catch (error) {
+        return null;
     }
-    if (Array.isArray(circuits)) {
-        for (const c of circuits) {
-            expectedArgs.push("--circuit", c);
-        }
+}
+/**
+ * Ensures the prover binary exists with the correct version, downloading it if necessary
+ */
+async function ensureProverBinary() {
+    const binaryPath = getProverPathByArch();
+    const binaryName = getProverNameByArch();
+    const expectedVersion = (0, downloadProverBinary_1.getProverVersion)();
+    const installedVersion = getInstalledProverVersion();
+    if (installedVersion === expectedVersion) {
+        return;
     }
-    if (proverPort) {
-        expectedArgs.push("--prover-address", `0.0.0.0:${proverPort}`);
+    if (installedVersion) {
+        console.log(`Prover binary version mismatch. Expected: ${expectedVersion}, Found: ${installedVersion}`);
+        console.log("Downloading correct version...");
     }
-    if (redisUrl) {
-        expectedArgs.push("--redis-url", redisUrl);
+    else if (fs_1.default.existsSync(binaryPath)) {
+        console.log("Prover binary found but version could not be determined. Downloading latest version...");
     }
-    let found = false;
-    for (const proc of proverProcesses) {
-        if (proc.cmd &&
-            (proc.cmd.includes("prover-") || proc.name.startsWith("prover-"))) {
-            console.log("\n[Prover Process Detected]");
-            console.log(`  PID: ${proc.pid}`);
-            console.log(`  Command: ${proc.cmd}`);
-            let matches = true;
-            for (const arg of expectedArgs) {
-                if (!proc.cmd.includes(arg)) {
-                    matches = false;
-                    break;
-                }
-            }
-            if (matches) {
-                found = true;
-                console.log("\x1b[32m✔ Prover is already running with the same configuration.\x1b[0m");
-                console.log("  To restart the prover, stop the process above or use the --force flag.\n");
-                break;
-            }
-            else {
-                const missing = proc.cmd
-                    ? expectedArgs.filter((arg) => !proc.cmd.includes(arg))
-                    : [];
-                if (missing.length > 0) {
-                    console.log(`  (Not a match for current request. Missing args: ${missing.join(", ")})`);
-                }
-            }
-        }
+    else {
+        console.log("Prover binary not found. Downloading...");
     }
-    if (!found) {
-        console.log("\x1b[33mNo running prover found with the requested configuration.\x1b[0m");
+    try {
+        await (0, downloadProverBinary_1.downloadProverBinary)(binaryPath, binaryName);
     }
-    return found;
-}
-async function startProver(proverPort, runMode, circuits = [], force = false, redisUrl) {
-    if (!force &&
-        (await isProverRunningWithFlags(runMode, circuits, proverPort))) {
-        return;
+    catch (error) {
+        throw new Error(`Failed to download prover binary: ${error instanceof Error ? error.message : String(error)}\n` +
+            `Please download manually from: https://github.com/Lightprotocol/light-protocol/releases`);
     }
-    console.log("Kill existing prover process...");
+}
+async function startProver(proverPort, redisUrl) {
+    await ensureProverBinary();
     await killProver();
     await (0, process_1.killProcessByPort)(proverPort);
-    const keysDir = path_1.default.join(__dirname, "../..", "bin", KEYS_DIR);
     const args = ["start"];
-    args.push("--keys-dir", keysDir);
+    args.push("--keys-dir", KEYS_DIR + "/");
     args.push("--prover-address", `0.0.0.0:${proverPort}`);
-    if (runMode != null) {
-        args.push("--run-mode", runMode);
-    }
-    for (const circuit of circuits) {
-        args.push("--circuit", circuit);
-    }
-    if (runMode != null) {
-        console.log(`Starting prover in ${runMode} mode...`);
-    }
-    else if (circuits && circuits.length > 0) {
-        console.log(`Starting prover with circuits: ${circuits.join(", ")}...`);
-    }
-    if ((!circuits || circuits.length === 0) && runMode == null) {
-        runMode = "local-rpc";
-        args.push("--run-mode", runMode);
-        console.log(`Starting prover with fallback ${runMode} mode...`);
-    }
+    args.push("--auto-download", "true");
     if (redisUrl) {
         args.push("--redis-url", redisUrl);
     }
@@ -106,25 +87,28 @@ async function startProver(proverPort, runMode, circuits = [], force = false, re
     console.log(`Prover started successfully!`);
 }
 function getProverNameByArch() {
-    const platform = process.platform;
-    const arch = process.arch;
-    if (!platform || !arch) {
+    const nodePlatform = process.platform;
+    const nodeArch = process.arch;
+    if (!nodePlatform || !nodeArch) {
         throw new Error("Unsupported platform or architecture");
     }
-    let binaryName = `prover-${platform}-${arch}`;
-    if (platform.toString() === "windows") {
-        throw new Error("Windows OS support is not included in this NPM release. Please reach out to team@lightprotocol.com to get the Windows binary.");
-        //@ts-ignore
+    let goPlatform = nodePlatform;
+    let goArch = nodeArch;
+    if (nodeArch === "x64") {
+        goArch = "amd64";
+    }
+    if (nodePlatform === "win32") {
+        goPlatform = "windows";
+    }
+    let binaryName = `prover-${goPlatform}-${goArch}`;
+    if (goPlatform === "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);
-    return binaryName;
+    const binaryName = getProverNameByArch();
+    return path_1.default.join(PROVER_BIN_DIR, binaryName);
 }
 async function healthCheck(port, retries = 3, timeout = 3000) {
     const fetch = (await Promise.resolve().then(() => tslib_1.__importStar(require("node-fetch")))).default;

package/dist/utils/proverVersion.generated.d.ts

@@ -0,0 +1 @@
+export declare const PROVER_VERSION = "2.0.7";

package/dist/utils/proverVersion.generated.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PROVER_VERSION = void 0;
+// Auto-generated from prover/server/VERSION - do not edit manually
+exports.PROVER_VERSION = "2.0.7";

package/dist/utils/utils.d.ts

@@ -1,6 +1,10 @@
 import * as anchor from "@coral-xyz/anchor";
 import { Keypair } from "@solana/web3.js";
 import { Rpc } from "@lightprotocol/stateless.js";
+/**
+ * Get a Keypair from a secret key file (compatible with Solana CLI)
+ */
+export declare function getKeypairFromFile(filepath?: string): Promise<Keypair>;
 export declare const defaultSolanaWalletKeypair: () => Keypair;
 export declare const setAnchorProvider: () => Promise<anchor.AnchorProvider>;
 export declare function rpc(): Rpc;

package/dist/utils/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomLoader = exports.setConfig = exports.getConfig = exports.getProverUrl = exports.getIndexerUrl = exports.getSolanaRpcUrl = exports.setAnchorProvider = exports.defaultSolanaWalletKeypair = void 0;
+exports.getKeypairFromFile = getKeypairFromFile;
 exports.rpc = rpc;
 exports.getPayer = getPayer;
 exports.generateSolanaTransactionURL = generateSolanaTransactionURL;
@@ -17,9 +18,45 @@ const web3_js_1 = require("@solana/web3.js");
 const stateless_js_1 = require("@lightprotocol/stateless.js");
 const bytes_1 = require("@coral-xyz/anchor/dist/cjs/utils/bytes");
 const constants_1 = require("./constants");
-const helpers_1 = require("@solana-developers/helpers");
 const cli_spinners_1 = tslib_1.__importDefault(require("cli-spinners"));
-require("dotenv").config();
+const dotenv_1 = tslib_1.__importDefault(require("dotenv"));
+dotenv_1.default.config();
+/**
+ * Get a Keypair from a secret key file (compatible with Solana CLI)
+ */
+async function getKeypairFromFile(filepath) {
+    // Default value from Solana CLI
+    const DEFAULT_FILEPATH = "~/.config/solana/id.json";
+    if (!filepath) {
+        filepath = DEFAULT_FILEPATH;
+    }
+    if (filepath[0] === "~") {
+        const home = process.env.HOME || null;
+        if (home) {
+            filepath = path.join(home, filepath.slice(1));
+        }
+    }
+    let fileContents;
+    try {
+        fileContents = fs.readFileSync(filepath, "utf8");
+    }
+    catch {
+        throw new Error(`Could not read keypair from file at '${filepath}'`);
+    }
+    // Parse contents of file
+    let parsedFileContents;
+    try {
+        parsedFileContents = Uint8Array.from(JSON.parse(fileContents));
+    }
+    catch (error_) {
+        const error = error_;
+        if (!error.message.includes("Unexpected token")) {
+            throw error;
+        }
+        throw new Error(`Invalid secret key file at '${filepath}'!`);
+    }
+    return web3_js_1.Keypair.fromSecretKey(parsedFileContents);
+}
 const defaultSolanaWalletKeypair = () => {
     const walletPath = process.env.HOME + "/.config/solana/id.json";
     if (fs.existsSync(walletPath)) {
@@ -52,7 +89,7 @@ function getWalletPath() {
     return process.env.HOME + "/.config/solana/id.json";
 }
 async function getPayer() {
-    return await (0, helpers_1.getKeypairFromFile)(getWalletPath());
+    return await getKeypairFromFile(getWalletPath());
 }
 function generateSolanaTransactionURL(transactionType, transactionHash, cluster) {
     return `https://explorer.solana.com/${transactionType}/${transactionHash}?cluster=${cluster}`;
@@ -131,6 +168,10 @@ const setConfig = (config, filePath) => {
 };
 exports.setConfig = setConfig;
 class CustomLoader {
+    message;
+    logInterval;
+    logTimer;
+    startTime;
     constructor(message, logInterval = 1000) {
         this.message = message;
         this.logInterval = logInterval;