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

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;