@lightprotocol/zk-compression-cli 0.15.2 → 0.17.0

package/dist/commands/init/index.js

@@ -11,7 +11,6 @@ const psp_utils_1 = require("../../psp-utils");
 const constants_1 = require("../../utils/constants");
 const utils_1 = require("../../utils");
 const case_anything_1 = require("case-anything");
-const child_process_1 = require("child_process");
 class InitCommand extends core_1.Command {
     async run() {
         const { args, flags } = await this.parse(InitCommand);
@@ -40,13 +39,14 @@ const initRepo = async (name, flags) => {
     const kebabCaseName = (0, case_anything_1.kebabCase)(name);
     const snakeCaseName = (0, case_anything_1.snakeCase)(name);
     const camelCaseName = (0, case_anything_1.pascalCase)(name);
-    // Set up environment variables for macOS builds
+    let command = localFilePath;
+    let env = { ...process.env };
     if (os.platform() === "darwin") {
-        process.env.CC = (0, child_process_1.execSync)("xcrun -find clang").toString().trim();
-        process.env.SDKROOT = (0, child_process_1.execSync)("xcrun --show-sdk-path").toString().trim();
+        const cpathExport = 'export CPATH="/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include:$CPATH"';
+        command = `${cpathExport} && ${command}`;
     }
     await (0, process_1.executeCommand)({
-        command: localFilePath,
+        command,
         args: [
             "generate",
             "--name",
@@ -91,8 +91,24 @@ const initRepo = async (name, flags) => {
             `tokio-version=${constants_1.TOKIO_VERSION}`,
         ],
         logFile: true,
-        env: process.env,
+        env: env,
     });
+    if (os.platform() === "darwin") {
+        console.log(`
+🧢 Important for macOS users 🧢
+---------------------------
+1. Run this command in your terminal:
+   export CPATH="/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include:$CPATH"
+
+2. To persist this change:
+   • Zsh users (default): Add the line to ~/.zshrc
+   • Bash users: Add the line to ~/.bash_profile
+
+3. Apply changes:
+   • Zsh: Run 'source ~/.zshrc'
+   • Bash: Run 'source ~/.bash_profile'
+    `.trim());
+    }
     await (0, stateless_js_1.sleep)(1000);
 };
 exports.initRepo = initRepo;

package/dist/utils/constants.d.ts

@@ -29,4 +29,4 @@ export declare const LIGHT_CLIENT_VERSION = "0.9.1";
 export declare const LIGHT_TEST_UTILS_VERSION = "1.2.1";
 export declare const SOLANA_PROGRAM_TEST_VERSION = "1.18.22";
 export declare const TOKIO_VERSION = "1.36.0";
-export declare const COMPRESSED_PROGRAM_TEMPLATE_TAG = "v0.1.1";
+export declare const COMPRESSED_PROGRAM_TEMPLATE_TAG = "v0.1.2";

package/dist/utils/constants.js

@@ -34,4 +34,4 @@ exports.LIGHT_CLIENT_VERSION = "0.9.1";
 exports.LIGHT_TEST_UTILS_VERSION = "1.2.1";
 exports.SOLANA_PROGRAM_TEST_VERSION = "1.18.22";
 exports.TOKIO_VERSION = "1.36.0";
-exports.COMPRESSED_PROGRAM_TEMPLATE_TAG = "v0.1.1";
+exports.COMPRESSED_PROGRAM_TEMPLATE_TAG = "v0.1.2";

package/dist/utils/process.js

@@ -35,14 +35,18 @@ async function killProcessByPort(port) {
  */
 async function executeCommand({ command, args, additionalPath, logFile = true, env, }) {
     return new Promise((resolve, reject) => {
-        const commandBase = path_1.default.basename(command);
+        const commandParts = command.split(' && ');
+        const finalCommand = commandParts.pop() || '';
+        const preCommands = commandParts.join(' && ');
+        const fullCommand = preCommands ? `${preCommands} && ${finalCommand} ${args.join(' ')}` : `${finalCommand} ${args.join(' ')}`;
+        const commandBase = path_1.default.basename(finalCommand);
         let stdoutData = "";
         const childPathEnv = additionalPath
             ? process.env.PATH + path_1.default.delimiter + additionalPath
             : process.env.PATH;
         const options = {
-            env: env ||
-                (childPathEnv ? { ...process.env, PATH: childPathEnv } : process.env),
+            env: env || (childPathEnv ? { ...process.env, PATH: childPathEnv } : process.env),
+            shell: true,
             detached: true,
         };
         let logStream = null;
@@ -52,14 +56,12 @@ async function executeCommand({ command, args, additionalPath, logFile = true, e
             if (!fs_1.default.existsSync(folderName)) {
                 fs_1.default.mkdirSync(folderName);
             }
-            logStream = fs_1.default.createWriteStream(file, {
-                flags: "a",
-            });
+            logStream = fs_1.default.createWriteStream(file, { flags: "a" });
         }
-        console.log(`Executing command ${commandBase} ${args}...`);
+        console.log(`Executing command: ${fullCommand}`);
         let childProcess;
         try {
-            childProcess = (0, child_process_1.spawn)(command, args, options);
+            childProcess = (0, child_process_1.spawn)(fullCommand, [], options);
         }
         catch (e) {
             throw new Error(`Failed to execute command ${commandBase}: ${e}`);

package/oclif.manifest.json

@@ -98,96 +98,6 @@
         "index.js"
       ]
     },
-    "compress-sol": {
-      "aliases": [],
-      "args": {},
-      "examples": [
-        "$ light compress-sol --to PublicKey --amount 10"
-      ],
-      "flags": {
-        "to": {
-          "description": "Specify the recipient address.",
-          "name": "to",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "amount": {
-          "description": "Amount to compress, in lamports.",
-          "name": "amount",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "compress-sol",
-      "pluginAlias": "@lightprotocol/zk-compression-cli",
-      "pluginName": "@lightprotocol/zk-compression-cli",
-      "pluginType": "core",
-      "strict": true,
-      "summary": "Compress SOL.",
-      "enableJsonFlag": false,
-      "isESM": false,
-      "relativePath": [
-        "dist",
-        "commands",
-        "compress-sol",
-        "index.js"
-      ]
-    },
-    "compress-spl": {
-      "aliases": [],
-      "args": {},
-      "examples": [
-        "$ light compress-spl --mint PublicKey --to PublicKey --amount 10"
-      ],
-      "flags": {
-        "mint": {
-          "description": "Specify the mint address.",
-          "name": "mint",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "to": {
-          "description": "Specify the recipient address (owner of destination compressed token account).",
-          "name": "to",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "amount": {
-          "description": "Amount to compress, in tokens.",
-          "name": "amount",
-          "required": true,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        }
-      },
-      "hasDynamicHelp": false,
-      "hiddenAliases": [],
-      "id": "compress-spl",
-      "pluginAlias": "@lightprotocol/zk-compression-cli",
-      "pluginName": "@lightprotocol/zk-compression-cli",
-      "pluginType": "core",
-      "strict": true,
-      "summary": "Compress SPL tokens.",
-      "enableJsonFlag": false,
-      "isESM": false,
-      "relativePath": [
-        "dist",
-        "commands",
-        "compress-spl",
-        "index.js"
-      ]
-    },
     "config:config": {
       "aliases": [],
       "args": {},
@@ -377,6 +287,96 @@
         "index.js"
       ]
     },
+    "compress-spl": {
+      "aliases": [],
+      "args": {},
+      "examples": [
+        "$ light compress-spl --mint PublicKey --to PublicKey --amount 10"
+      ],
+      "flags": {
+        "mint": {
+          "description": "Specify the mint address.",
+          "name": "mint",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "to": {
+          "description": "Specify the recipient address (owner of destination compressed token account).",
+          "name": "to",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "amount": {
+          "description": "Amount to compress, in tokens.",
+          "name": "amount",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "compress-spl",
+      "pluginAlias": "@lightprotocol/zk-compression-cli",
+      "pluginName": "@lightprotocol/zk-compression-cli",
+      "pluginType": "core",
+      "strict": true,
+      "summary": "Compress SPL tokens.",
+      "enableJsonFlag": false,
+      "isESM": false,
+      "relativePath": [
+        "dist",
+        "commands",
+        "compress-spl",
+        "index.js"
+      ]
+    },
+    "compress-sol": {
+      "aliases": [],
+      "args": {},
+      "examples": [
+        "$ light compress-sol --to PublicKey --amount 10"
+      ],
+      "flags": {
+        "to": {
+          "description": "Specify the recipient address.",
+          "name": "to",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "amount": {
+          "description": "Amount to compress, in lamports.",
+          "name": "amount",
+          "required": true,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        }
+      },
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "compress-sol",
+      "pluginAlias": "@lightprotocol/zk-compression-cli",
+      "pluginName": "@lightprotocol/zk-compression-cli",
+      "pluginType": "core",
+      "strict": true,
+      "summary": "Compress SOL.",
+      "enableJsonFlag": false,
+      "isESM": false,
+      "relativePath": [
+        "dist",
+        "commands",
+        "compress-sol",
+        "index.js"
+      ]
+    },
     "decompress-sol": {
       "aliases": [],
       "args": {},
@@ -831,5 +831,5 @@
       ]
     }
   },
-  "version": "0.15.2"
+  "version": "0.17.0"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightprotocol/zk-compression-cli",
-  "version": "0.15.2",
+  "version": "0.17.0",
   "description": "ZK Compression: Secure Scaling on Solana",
   "maintainers": [
     {
@@ -44,9 +44,9 @@
     "tweetnacl": "^1.0.3",
     "wait-on": "^7.2.0",
     "which": "^4.0.0",
+    "@lightprotocol/compressed-token": "0.13.0",
     "@lightprotocol/hasher.rs": "0.2.0",
-    "@lightprotocol/stateless.js": "0.13.0",
-    "@lightprotocol/compressed-token": "0.13.0"
+    "@lightprotocol/stateless.js": "0.13.0"
   },
   "devDependencies": {
     "@oclif/test": "2.3.9",