@lightprotocol/zk-compression-cli 0.3.0 → 0.4.0

package/dist/utils/initTestEnv.d.ts

@@ -1,4 +1,4 @@
-export declare function initTestEnv({ additionalPrograms, skipSystemAccounts, indexer, prover, proveCompressedAccounts, proveNewAddresses, checkPhotonVersion, photonDatabaseUrl, }: {
+export declare function initTestEnv({ additionalPrograms, skipSystemAccounts, indexer, prover, forester, rpcPort, indexerPort, proverPort, gossipHost, proveCompressedAccounts, proveNewAddresses, checkPhotonVersion, photonDatabaseUrl, limitLedgerSize, }: {
     additionalPrograms?: {
         address: string;
         path: string;
@@ -6,12 +6,18 @@ export declare function initTestEnv({ additionalPrograms, skipSystemAccounts, in
     skipSystemAccounts?: boolean;
     indexer: boolean;
     prover: boolean;
+    forester: boolean;
+    rpcPort?: number;
+    indexerPort?: number;
+    proverPort?: number;
+    gossipHost?: string;
     proveCompressedAccounts?: boolean;
     proveNewAddresses?: boolean;
     checkPhotonVersion?: boolean;
     photonDatabaseUrl?: string;
+    limitLedgerSize?: number;
 }): Promise<void>;
-export declare function initTestEnvIfNeeded({ additionalPrograms, skipSystemAccounts, indexer, prover, }?: {
+export declare function initTestEnvIfNeeded({ additionalPrograms, skipSystemAccounts, indexer, prover, forester, }?: {
     additionalPrograms?: {
         address: string;
         path: string;
@@ -19,20 +25,27 @@ export declare function initTestEnvIfNeeded({ additionalPrograms, skipSystemAcco
     skipSystemAccounts?: boolean;
     indexer?: boolean;
     prover?: boolean;
+    forester?: boolean;
 }): Promise<void>;
-export declare function getSolanaArgs({ additionalPrograms, skipSystemAccounts, downloadBinaries, }: {
+export declare function getSolanaArgs({ additionalPrograms, skipSystemAccounts, limitLedgerSize, rpcPort, gossipHost, downloadBinaries, }: {
     additionalPrograms?: {
         address: string;
         path: string;
     }[];
     skipSystemAccounts?: boolean;
+    limitLedgerSize?: number;
+    rpcPort?: number;
+    gossipHost?: string;
     downloadBinaries?: boolean;
 }): Promise<Array<string>>;
-export declare function startTestValidator({ additionalPrograms, skipSystemAccounts, }: {
+export declare function startTestValidator({ additionalPrograms, skipSystemAccounts, limitLedgerSize, rpcPort, gossipHost, }: {
     additionalPrograms?: {
         address: string;
         path: string;
     }[];
     skipSystemAccounts?: boolean;
+    limitLedgerSize?: number;
+    rpcPort?: number;
+    gossipHost?: string;
 }): Promise<void>;
 export declare function killTestValidator(): Promise<void>;

package/dist/utils/initTestEnv.js

@@ -10,7 +10,8 @@ const psp_utils_1 = require("../psp-utils");
 const process_1 = require("./process");
 const processProverServer_1 = require("./processProverServer");
 const processPhotonIndexer_1 = require("./processPhotonIndexer");
-async function initTestEnv({ additionalPrograms, skipSystemAccounts, indexer = true, prover = true, proveCompressedAccounts = true, proveNewAddresses = false, checkPhotonVersion = true, photonDatabaseUrl, }) {
+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");
     const initAccounts = async () => {
         const anchorProvider = await (0, utils_1.setAnchorProvider)();
@@ -22,19 +23,34 @@ async function initTestEnv({ additionalPrograms, skipSystemAccounts, indexer = t
         });
     };
     // We cannot await this promise directly because it will hang the process
-    startTestValidator({ additionalPrograms, skipSystemAccounts });
-    await (0, process_1.waitForServers)([{ port: 8899, path: "/health" }]);
-    await (0, process_1.confirmServerStability)("http://127.0.0.1:8899/health");
+    startTestValidator({
+        additionalPrograms,
+        skipSystemAccounts,
+        limitLedgerSize,
+        rpcPort,
+        gossipHost,
+    });
+    await (0, process_1.waitForServers)([{ port: rpcPort, path: "/health" }]);
+    await (0, process_1.confirmServerStability)(`http://127.0.0.1:${rpcPort}/health`);
     await initAccounts();
     if (indexer) {
-        await (0, processPhotonIndexer_1.startIndexer)(checkPhotonVersion, photonDatabaseUrl);
+        const config = (0, utils_1.getConfig)();
+        config.indexerUrl = `http://127.0.0.1:${indexerPort}`;
+        (0, utils_1.setConfig)(config);
+        await (0, processPhotonIndexer_1.startIndexer)(`http://127.0.0.1:${rpcPort}`, indexerPort, checkPhotonVersion, photonDatabaseUrl);
     }
     if (prover) {
-        await (0, processProverServer_1.startProver)(proveCompressedAccounts, proveNewAddresses);
+        const config = (0, utils_1.getConfig)();
+        config.proverUrl = `http://127.0.0.1:${proverPort}`;
+        (0, utils_1.setConfig)(config);
+        await (0, processProverServer_1.startProver)(proverPort, proveCompressedAccounts, proveNewAddresses);
+    }
+    if (forester) {
+        await (0, processForester_1.startForester)();
     }
 }
 exports.initTestEnv = initTestEnv;
-async function initTestEnvIfNeeded({ additionalPrograms, skipSystemAccounts, indexer = false, prover = false, } = {}) {
+async function initTestEnvIfNeeded({ additionalPrograms, skipSystemAccounts, indexer = false, prover = false, forester = false, } = {}) {
     try {
         const anchorProvider = await (0, utils_1.setAnchorProvider)();
         // this request will fail if there is no local test validator running
@@ -48,6 +64,7 @@ async function initTestEnvIfNeeded({ additionalPrograms, skipSystemAccounts, ind
             skipSystemAccounts,
             indexer,
             prover,
+            forester,
         });
     }
 }
@@ -83,8 +100,7 @@ function programFilePath(programName) {
     }
     return path_1.default.resolve(__dirname, path_1.default.join(constants_1.BASE_PATH, programName));
 }
-async function getSolanaArgs({ additionalPrograms, skipSystemAccounts, downloadBinaries = true, }) {
-    const LIMIT_LEDGER_SIZE = "500000000";
+async function getSolanaArgs({ additionalPrograms, skipSystemAccounts, limitLedgerSize, rpcPort, gossipHost, downloadBinaries = true, }) {
     // TODO: adjust program tags
     const programs = [
         {
@@ -93,24 +109,24 @@ async function getSolanaArgs({ additionalPrograms, skipSystemAccounts, downloadB
             tag: constants_1.SPL_NOOP_PROGRAM_TAG,
         },
         {
-            id: "6UqiSPd2mRCTTwkzhcs1M6DGYsqHWd5jiPueX3LwDMXQ",
+            id: "H5sFv8VwWmjxHYS2GB4fTDsK7uTtnRT4WiixtHrET3bN",
             name: "light_system_program.so",
-            tag: constants_1.LIGHT_MERKLE_TREE_PROGRAM_TAG,
+            tag: constants_1.LIGHT_SYSTEM_PROGRAM_TAG,
         },
         {
-            id: "9sixVEthz2kMSKfeApZXHwuboT6DZuT6crAYJTciUCqE",
+            id: "HXVfQ44ATEi9WBKLSCCwM54KokdkzqXci9xCQ7ST9SYN",
             name: "light_compressed_token.so",
-            tag: constants_1.LIGHT_MERKLE_TREE_PROGRAM_TAG,
+            tag: constants_1.LIGHT_COMPRESSED_TOKEN_TAG,
         },
         {
-            id: "5QPEJ5zDsVou9FQS3KCauKswM3VwBEBu4dpL9xTqkWwN",
+            id: "CbjvJc1SNx1aav8tU49dJGHu8EUdzQJSMtkjDmV8miqK",
             name: "account_compression.so",
-            tag: constants_1.LIGHT_MERKLE_TREE_PROGRAM_TAG,
+            tag: constants_1.LIGHT_ACCOUNT_COMPRESSION_TAG,
         },
         {
-            id: "5WzvRtu7LABotw1SUEpguJiKU27LRGsiCnF5FH6VV7yP",
+            id: "7Z9Yuy3HkBCc2Wf3xzMGnz6qpV4n7ciwcoEMGKqhAnj1",
             name: "light_registry.so",
-            tag: constants_1.LIGHT_MERKLE_TREE_PROGRAM_TAG,
+            tag: constants_1.LIGHT_REGISTRY_TAG,
         },
     ];
     if (additionalPrograms)
@@ -120,7 +136,9 @@ async function getSolanaArgs({ additionalPrograms, skipSystemAccounts, downloadB
     const dirPath = programsDirPath();
     const solanaArgs = [
         "--reset",
-        `--limit-ledger-size=${LIMIT_LEDGER_SIZE}`,
+        `--limit-ledger-size=${limitLedgerSize}`,
+        `--rpc-port=${rpcPort}`,
+        `--gossip-host=${gossipHost}`,
         "--quiet",
     ];
     for (const program of programs) {
@@ -150,11 +168,14 @@ async function getSolanaArgs({ additionalPrograms, skipSystemAccounts, downloadB
     return solanaArgs;
 }
 exports.getSolanaArgs = getSolanaArgs;
-async function startTestValidator({ additionalPrograms, skipSystemAccounts, }) {
+async function startTestValidator({ additionalPrograms, skipSystemAccounts, limitLedgerSize, rpcPort, gossipHost, }) {
     const command = "solana-test-validator";
     const solanaArgs = await getSolanaArgs({
         additionalPrograms,
         skipSystemAccounts,
+        limitLedgerSize,
+        rpcPort,
+        gossipHost,
     });
     await killTestValidator();
     await new Promise((r) => setTimeout(r, 1000));

package/dist/utils/process.d.ts

@@ -1,5 +1,5 @@
 export declare function killProcess(processName: string): Promise<void>;
-export declare function killProcessByPort(port: string): Promise<void>;
+export declare function killProcessByPort(port: number): Promise<void>;
 /**
  * Executes a command and logs the output to the console.
  * @param command - Path to the command to be executed.

package/dist/utils/process.js

@@ -19,7 +19,7 @@ async function killProcess(processName) {
 }
 exports.killProcess = killProcess;
 async function killProcessByPort(port) {
-    await execute("lsof -t -i:3001 | while read line; do kill -9 $line; done");
+    await execute(`lsof -t -i:${port} | while read line; do kill -9 $line; done`);
 }
 exports.killProcessByPort = killProcessByPort;
 /**
@@ -40,17 +40,16 @@ async function executeCommand({ command, args, additionalPath, logFile = true, }
             env: childPathEnv ? { ...process.env, PATH: childPathEnv } : process.env,
             detached: true,
         };
+        let logStream = null;
         if (logFile) {
             const folderName = "test-ledger";
             const file = `./${folderName}/${commandBase}.log`;
             if (!fs_1.default.existsSync(folderName)) {
                 fs_1.default.mkdirSync(folderName);
             }
-            const logStream = fs_1.default.createWriteStream(file, {
+            logStream = fs_1.default.createWriteStream(file, {
                 flags: "a",
             });
-            process.stdout.pipe(logStream);
-            process.stderr.pipe(logStream);
         }
         console.log(`Executing command ${commandBase} ${args}...`);
         let childProcess;
@@ -60,6 +59,10 @@ async function executeCommand({ command, args, additionalPath, logFile = true, }
         catch (e) {
             throw new Error(`Failed to execute command ${commandBase}: ${e}`);
         }
+        if (logStream) {
+            childProcess.stdout.pipe(logStream);
+            childProcess.stderr.pipe(logStream);
+        }
         childProcess.stdout.on("data", (data) => {
             stdoutData += data.toString();
             process.stdout.write(data);
@@ -68,6 +71,9 @@ async function executeCommand({ command, args, additionalPath, logFile = true, }
             process.stderr.write(data);
         });
         childProcess.on("close", (code) => {
+            if (logStream) {
+                logStream.end();
+            }
             if (code !== 0) {
                 console.log(`${commandBase} exited with code ${code}`);
                 reject(new Error(`${commandBase} exited with code ${code}`));
@@ -123,7 +129,7 @@ async function waitForServers(servers) {
     const opts = {
         resources: servers.map(({ port, path }) => `http-get://127.0.0.1:${port}${path}`),
         delay: 1000,
-        timeout: 15000,
+        timeout: 25000,
         interval: 300,
         simultaneous: 2,
         validateStatus: function (status) {

package/dist/utils/processForester.d.ts

@@ -0,0 +1,3 @@
+export declare function killForester(): Promise<void>;
+export declare function startForester(): Promise<void>;
+export declare function getForesterBinaryName(): string;

package/dist/utils/processForester.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getForesterBinaryName = exports.startForester = exports.killForester = void 0;
+const tslib_1 = require("tslib");
+const path_1 = tslib_1.__importDefault(require("path"));
+const process_1 = require("./process");
+const constants_1 = require("./constants");
+async function killForester() {
+    await (0, process_1.killProcess)(constants_1.FORESTER_PROCESS_NAME);
+}
+exports.killForester = killForester;
+async function startForester() {
+    console.log("Killing existing forester process...");
+    await killForester();
+    console.log("Starting forester...");
+    (0, process_1.spawnBinary)(getForesterBinaryName(), ["subscribe"]);
+    console.log("Forester started successfully!");
+}
+exports.startForester = startForester;
+function getForesterBinaryName() {
+    const binDir = path_1.default.join(__dirname, "../..", "bin");
+    const binaryName = path_1.default.join(binDir, "forester");
+    return binaryName;
+}
+exports.getForesterBinaryName = getForesterBinaryName;

package/dist/utils/processPhotonIndexer.d.ts

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

package/dist/utils/processPhotonIndexer.js

@@ -7,7 +7,7 @@ const process_1 = require("./process");
 const constants_1 = require("./constants");
 const node_child_process_1 = require("node:child_process");
 const util = tslib_1.__importStar(require("node:util"));
-async function startIndexer(checkPhotonVersion = true, photonDatabaseUrl) {
+async function startIndexer(rpcUrl, indexerPort, checkPhotonVersion = true, photonDatabaseUrl) {
     await killIndexer();
     const resolvedOrNull = which_1.default.sync("photon", { nothrow: true });
     if (resolvedOrNull === null ||
@@ -20,10 +20,17 @@ async function startIndexer(checkPhotonVersion = true, photonDatabaseUrl) {
         console.log("Starting indexer...");
         let args = [];
         if (photonDatabaseUrl) {
-            args = ["--db-url", photonDatabaseUrl];
+            args = [
+                "--db-url",
+                photonDatabaseUrl,
+                "--port",
+                indexerPort.toString(),
+                "--rpc-url",
+                rpcUrl,
+            ];
         }
         (0, process_1.spawnBinary)(constants_1.INDEXER_PROCESS_NAME, args);
-        await (0, process_1.waitForServers)([{ port: 8784, path: "/getIndexerHealth" }]);
+        await (0, process_1.waitForServers)([{ port: indexerPort, path: "/getIndexerHealth" }]);
         console.log("Indexer started successfully!");
     }
 }

package/dist/utils/processProverServer.d.ts

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

package/dist/utils/processProverServer.js

@@ -12,22 +12,23 @@ async function killProver() {
     await (0, process_1.killProcess)(constants_1.LIGHT_PROVER_PROCESS_NAME);
 }
 exports.killProver = killProver;
-async function startProver(proveCompressedAccounts, proveNewAddresses) {
+async function startProver(proverPort, proveCompressedAccounts, proveNewAddresses) {
     if (!proveCompressedAccounts && !proveNewAddresses) {
         console.log("No flags provided. Please provide at least one flag to start the prover.");
         process.exit(1);
     }
     console.log("Kill existing prover process...");
     await killProver();
-    await (0, process_1.killProcessByPort)("3001");
+    await (0, process_1.killProcessByPort)(proverPort);
     const keysDir = path_1.default.join(__dirname, "../..", "bin", KEYS_DIR);
     const args = ["start"];
     args.push(`--inclusion=${proveCompressedAccounts ? "true" : "false"}`);
     args.push(`--non-inclusion=${proveNewAddresses ? "true" : "false"}`);
     args.push("--keys-dir", keysDir);
+    args.push("--prover-address", `0.0.0.0:${proverPort}`);
     console.log("Starting prover...");
     (0, process_1.spawnBinary)(getProverNameByArch(), args);
-    await (0, process_1.waitForServers)([{ port: 3001, path: "/" }]);
+    await (0, process_1.waitForServers)([{ port: proverPort, path: "/" }]);
     console.log("Prover started successfully!");
 }
 exports.startProver = startProver;

package/dist/utils/utils.d.ts

@@ -1,13 +1,19 @@
 import * as anchor from "@coral-xyz/anchor";
 import { Keypair } from "@solana/web3.js";
+import { Rpc } from "@lightprotocol/stateless.js";
 export declare const defaultSolanaWalletKeypair: () => Keypair;
 export declare const setAnchorProvider: () => Promise<anchor.AnchorProvider>;
+export declare function rpc(): Rpc;
 export declare function getPayer(): Promise<anchor.web3.Keypair>;
 export declare function generateSolanaTransactionURL(transactionType: "tx" | "address", transactionHash: string, cluster: string): string;
 type Config = {
     solanaRpcUrl: string;
+    indexerUrl: string;
+    proverUrl: string;
 };
 export declare const getSolanaRpcUrl: () => string;
+export declare const getIndexerUrl: () => string;
+export declare const getProverUrl: () => string;
 export declare const getConfig: (filePath?: string) => Config;
 export declare function ensureDirectoryExists(dirPath: string): void;
 export declare const setConfig: (config: Partial<Config>, filePath?: string) => void;

package/dist/utils/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isValidBase58SecretKey = exports.isValidURL = exports.CustomLoader = exports.setConfig = exports.ensureDirectoryExists = exports.getConfig = exports.getSolanaRpcUrl = exports.generateSolanaTransactionURL = exports.getPayer = exports.setAnchorProvider = exports.defaultSolanaWalletKeypair = void 0;
+exports.isValidBase58SecretKey = exports.isValidURL = exports.CustomLoader = exports.setConfig = exports.ensureDirectoryExists = exports.getConfig = exports.getProverUrl = exports.getIndexerUrl = exports.getSolanaRpcUrl = exports.generateSolanaTransactionURL = exports.getPayer = exports.rpc = exports.setAnchorProvider = exports.defaultSolanaWalletKeypair = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs"));
 const fs_1 = require("fs");
@@ -34,6 +34,15 @@ const setAnchorProvider = async () => {
     return anchorProvider;
 };
 exports.setAnchorProvider = setAnchorProvider;
+function rpc() {
+    if ((0, exports.getSolanaRpcUrl)() === "" ||
+        (0, exports.getIndexerUrl)() === "" ||
+        (0, exports.getProverUrl)() === "") {
+        throw new Error("Please set the Solana RPC URL, Indexer URL, and Prover URL in the config file");
+    }
+    return (0, stateless_js_1.createRpc)((0, exports.getSolanaRpcUrl)(), (0, exports.getIndexerUrl)(), (0, exports.getProverUrl)());
+}
+exports.rpc = rpc;
 function getWalletPath() {
     return process.env.HOME + "/.config/solana/id.json";
 }
@@ -50,6 +59,16 @@ const getSolanaRpcUrl = () => {
     return config.solanaRpcUrl;
 };
 exports.getSolanaRpcUrl = getSolanaRpcUrl;
+const getIndexerUrl = () => {
+    const config = (0, exports.getConfig)();
+    return config.indexerUrl;
+};
+exports.getIndexerUrl = getIndexerUrl;
+const getProverUrl = () => {
+    const config = (0, exports.getConfig)();
+    return config.proverUrl;
+};
+exports.getProverUrl = getProverUrl;
 function getConfigPath() {
     // Check for the environment variable
     const envConfigPath = process.env.LIGHT_PROTOCOL_CONFIG;