genlayer 0.0.19 → 0.0.20

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 
 
+## 0.0.20 (2024-04-26)
+
 ## 0.0.19 (2024-04-26)
 
 ## 0.0.17 (2024-04-23)

package/dist/index.js

@@ -1052,7 +1052,7 @@ var require_command = __commonJS({
     var EventEmitter = require("events").EventEmitter;
     var childProcess = require("child_process");
     var path = require("path");
-    var fs2 = require("fs");
+    var fs3 = require("fs");
     var process4 = require("process");
     var { Argument: Argument2, humanReadableArgName } = require_argument();
     var { CommanderError: CommanderError2 } = require_error();
@@ -1951,11 +1951,11 @@ Expecting one of '${allowedValues.join("', '")}'`);
         const sourceExt = [".js", ".ts", ".tsx", ".mjs", ".cjs"];
         function findFile(baseDir, baseName) {
           const localBin = path.resolve(baseDir, baseName);
-          if (fs2.existsSync(localBin))
+          if (fs3.existsSync(localBin))
             return localBin;
           if (sourceExt.includes(path.extname(baseName)))
             return void 0;
-          const foundExt = sourceExt.find((ext) => fs2.existsSync(`${localBin}${ext}`));
+          const foundExt = sourceExt.find((ext) => fs3.existsSync(`${localBin}${ext}`));
           if (foundExt)
             return `${localBin}${foundExt}`;
           return void 0;
@@ -1967,7 +1967,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
         if (this._scriptPath) {
           let resolvedScriptPath;
           try {
-            resolvedScriptPath = fs2.realpathSync(this._scriptPath);
+            resolvedScriptPath = fs3.realpathSync(this._scriptPath);
           } catch (err) {
             resolvedScriptPath = this._scriptPath;
           }
@@ -17601,10 +17601,10 @@ var require_supports_color = __commonJS({
         return 3;
       }
       if ("TERM_PROGRAM" in env2) {
-        const version = parseInt((env2.TERM_PROGRAM_VERSION || "").split(".")[0], 10);
+        const version2 = parseInt((env2.TERM_PROGRAM_VERSION || "").split(".")[0], 10);
         switch (env2.TERM_PROGRAM) {
           case "iTerm.app":
-            return version >= 3 ? 3 : 2;
+            return version2 >= 3 ? 3 : 2;
           case "Apple_Terminal":
             return 2;
         }
@@ -29099,7 +29099,7 @@ var require_iso2022 = __commonJS({
 var require_chardet = __commonJS({
   "node_modules/chardet/index.js"(exports2, module2) {
     "use strict";
-    var fs2 = require("fs");
+    var fs3 = require("fs");
     var utf8 = require_utf8();
     var unicode = require_unicode();
     var mbcs = require_mbcs();
@@ -29173,29 +29173,29 @@ var require_chardet = __commonJS({
       var fd;
       var handler = function(err, buffer) {
         if (fd) {
-          fs2.closeSync(fd);
+          fs3.closeSync(fd);
         }
         if (err)
           return cb(err, null);
         cb(null, self2.detect(buffer, opts));
       };
       if (opts && opts.sampleSize) {
-        fd = fs2.openSync(filepath, "r"), sample = Buffer.allocUnsafe(opts.sampleSize);
-        fs2.read(fd, sample, 0, opts.sampleSize, null, function(err) {
+        fd = fs3.openSync(filepath, "r"), sample = Buffer.allocUnsafe(opts.sampleSize);
+        fs3.read(fd, sample, 0, opts.sampleSize, null, function(err) {
           handler(err, sample);
         });
         return;
       }
-      fs2.readFile(filepath, handler);
+      fs3.readFile(filepath, handler);
     };
     module2.exports.detectFileSync = function(filepath, opts) {
       if (opts && opts.sampleSize) {
-        var fd = fs2.openSync(filepath, "r"), sample2 = Buffer.allocUnsafe(opts.sampleSize);
-        fs2.readSync(fd, sample2, 0, opts.sampleSize);
-        fs2.closeSync(fd);
+        var fd = fs3.openSync(filepath, "r"), sample2 = Buffer.allocUnsafe(opts.sampleSize);
+        fs3.readSync(fd, sample2, 0, opts.sampleSize);
+        fs3.closeSync(fd);
         return self2.detect(sample2, opts);
       }
-      return self2.detect(fs2.readFileSync(filepath), opts);
+      return self2.detect(fs3.readFileSync(filepath), opts);
     };
     module2.exports.detectAll = function(buffer, opts) {
       if (typeof opts !== "object") {
@@ -32699,7 +32699,7 @@ var require_os_tmpdir = __commonJS({
 var require_tmp = __commonJS({
   "node_modules/tmp/lib/tmp.js"(exports2, module2) {
     "use strict";
-    var fs2 = require("fs");
+    var fs3 = require("fs");
     var path = require("path");
     var crypto3 = require("crypto");
     var osTmpDir = require_os_tmpdir();
@@ -32763,7 +32763,7 @@ var require_tmp = __commonJS({
         return cb(new Error("Invalid template provided"));
       (function _getUniqueName() {
         const name = _generateTmpName(opts);
-        fs2.stat(name, function(err) {
+        fs3.stat(name, function(err) {
           if (!err) {
             if (tries-- > 0)
               return _getUniqueName();
@@ -32782,7 +32782,7 @@ var require_tmp = __commonJS({
       do {
         const name = _generateTmpName(opts);
         try {
-          fs2.statSync(name);
+          fs3.statSync(name);
         } catch (e2) {
           return name;
         }
@@ -32795,14 +32795,14 @@ var require_tmp = __commonJS({
       tmpName(opts, function _tmpNameCreated(err, name) {
         if (err)
           return cb(err);
-        fs2.open(name, CREATE_FLAGS, opts.mode || FILE_MODE, function _fileCreated(err2, fd) {
+        fs3.open(name, CREATE_FLAGS, opts.mode || FILE_MODE, function _fileCreated(err2, fd) {
           if (err2)
             return cb(err2);
           if (opts.discardDescriptor) {
-            return fs2.close(fd, function _discardCallback(err3) {
+            return fs3.close(fd, function _discardCallback(err3) {
               if (err3) {
                 try {
-                  fs2.unlinkSync(name);
+                  fs3.unlinkSync(name);
                 } catch (e2) {
                   if (!isENOENT(e2)) {
                     err3 = e2;
@@ -32825,9 +32825,9 @@ var require_tmp = __commonJS({
       opts.postfix = opts.postfix || ".tmp";
       const discardOrDetachDescriptor = opts.discardDescriptor || opts.detachDescriptor;
       const name = tmpNameSync(opts);
-      var fd = fs2.openSync(name, CREATE_FLAGS, opts.mode || FILE_MODE);
+      var fd = fs3.openSync(name, CREATE_FLAGS, opts.mode || FILE_MODE);
       if (opts.discardDescriptor) {
-        fs2.closeSync(fd);
+        fs3.closeSync(fd);
         fd = void 0;
       }
       return {
@@ -32839,9 +32839,9 @@ var require_tmp = __commonJS({
     function _rmdirRecursiveSync(root) {
       const dirs = [root];
       do {
-        var dir2 = dirs.pop(), deferred = false, files = fs2.readdirSync(dir2);
+        var dir2 = dirs.pop(), deferred = false, files = fs3.readdirSync(dir2);
         for (var i2 = 0, length = files.length; i2 < length; i2++) {
-          var file2 = path.join(dir2, files[i2]), stat2 = fs2.lstatSync(file2);
+          var file2 = path.join(dir2, files[i2]), stat2 = fs3.lstatSync(file2);
           if (stat2.isDirectory()) {
             if (!deferred) {
               deferred = true;
@@ -32849,11 +32849,11 @@ var require_tmp = __commonJS({
             }
             dirs.push(file2);
           } else {
-            fs2.unlinkSync(file2);
+            fs3.unlinkSync(file2);
           }
         }
         if (!deferred) {
-          fs2.rmdirSync(dir2);
+          fs3.rmdirSync(dir2);
         }
       } while (dirs.length !== 0);
     }
@@ -32862,7 +32862,7 @@ var require_tmp = __commonJS({
       tmpName(opts, function _tmpNameCreated(err, name) {
         if (err)
           return cb(err);
-        fs2.mkdir(name, opts.mode || DIR_MODE, function _dirCreated(err2) {
+        fs3.mkdir(name, opts.mode || DIR_MODE, function _dirCreated(err2) {
           if (err2)
             return cb(err2);
           cb(null, name, _prepareTmpDirRemoveCallback(name, opts));
@@ -32872,7 +32872,7 @@ var require_tmp = __commonJS({
     function dirSync(options) {
       var args = _parseArguments(options), opts = args[0];
       const name = tmpNameSync(opts);
-      fs2.mkdirSync(name, opts.mode || DIR_MODE);
+      fs3.mkdirSync(name, opts.mode || DIR_MODE);
       return {
         name,
         removeCallback: _prepareTmpDirRemoveCallback(name, opts)
@@ -32882,7 +32882,7 @@ var require_tmp = __commonJS({
       const removeCallback = _prepareRemoveCallback(function _removeCallback(fdPath) {
         try {
           if (0 <= fdPath[0]) {
-            fs2.closeSync(fdPath[0]);
+            fs3.closeSync(fdPath[0]);
           }
         } catch (e2) {
           if (!isEBADF(e2) && !isENOENT(e2)) {
@@ -32890,7 +32890,7 @@ var require_tmp = __commonJS({
           }
         }
         try {
-          fs2.unlinkSync(fdPath[1]);
+          fs3.unlinkSync(fdPath[1]);
         } catch (e2) {
           if (!isENOENT(e2)) {
             throw e2;
@@ -32903,7 +32903,7 @@ var require_tmp = __commonJS({
       return removeCallback;
     }
     function _prepareTmpDirRemoveCallback(name, opts) {
-      const removeFunction = opts.unsafeCleanup ? _rmdirRecursiveSync : fs2.rmdirSync.bind(fs2);
+      const removeFunction = opts.unsafeCleanup ? _rmdirRecursiveSync : fs3.rmdirSync.bind(fs3);
       const removeCallback = _prepareRemoveCallback(removeFunction, name);
       if (!opts.keep) {
         _removeObjects.unshift(removeCallback);
@@ -32948,10 +32948,10 @@ var require_tmp = __commonJS({
     function setGracefulCleanup() {
       _gracefulCleanup = true;
     }
-    var version = process.versions.node.split(".").map(function(value) {
+    var version2 = process.versions.node.split(".").map(function(value) {
       return parseInt(value, 10);
     });
-    if (version[0] === 0 && (version[1] < 9 || version[1] === 9 && version[2] < 5)) {
+    if (version2[0] === 0 && (version2[1] < 9 || version2[1] === 9 && version2[2] < 5)) {
       process.addListener("uncaughtException", function _uncaughtExceptionThrown(err) {
         _uncaughtException = true;
         _garbageCollector();
@@ -39555,6 +39555,9 @@ var {
   Help
 } = import_index.default;
 
+// package.json
+var version = "0.0.20";
+
 // src/lib/config/text.ts
 var CLI_DESCRIPTION = "GenLayer CLI is a development environment for the GenLayer ecosystem. It allows developers to interact with the protocol by creating accounts, sending transactions, and working with Intelligent Contracts by testing, debugging, and deploying them.";
 
@@ -39836,10 +39839,10 @@ function _supportsColor(haveStream, { streamIsTTY, sniffFlags = true } = {}) {
     return 3;
   }
   if ("TERM_PROGRAM" in env) {
-    const version = Number.parseInt((env.TERM_PROGRAM_VERSION || "").split(".")[0], 10);
+    const version2 = Number.parseInt((env.TERM_PROGRAM_VERSION || "").split(".")[0], 10);
     switch (env.TERM_PROGRAM) {
       case "iTerm.app": {
-        return version >= 3 ? 3 : 2;
+        return version2 >= 3 ? 3 : 2;
       }
       case "Apple_Terminal": {
         return 2;
@@ -42145,6 +42148,9 @@ var inquirer = {
 };
 var inquirer_default = inquirer;
 
+// src/lib/services/simulator.ts
+var fs2 = __toESM(require("fs"));
+
 // node_modules/node-fetch/src/index.js
 var import_node_http2 = __toESM(require("http"), 1);
 var import_node_https = __toESM(require("https"), 1);
@@ -43504,11 +43510,11 @@ var DEFAULT_REPO_GH_URL = "git@github.com:yeagerai/genlayer-simulator.git";
 var DEFAULT_RUN_SIMULATOR_COMMAND = (simulatorLocation) => ({
   darwin: `osascript -e 'tell application "Terminal" to do script "cd ${simulatorLocation} && cp .env.example .env && docker compose build && docker compose up"'`,
   win32: `start cmd.exe /k "cd ${simulatorLocation} && xcopy .env.example .env && docker compose build && docker compose up"`,
-  linux: `x-terminal-emulator -e 'bash -c "cd ${simulatorLocation} && cp .env.example .env && docker compose build && docker compose up"'`
+  linux: `x-terminal-emulator -e bash -c 'cd ${simulatorLocation} && cp .env.example .env && docker compose build && docker compose up; echo "Press enter to exit"; read'`
 });
 var AVAILABLE_PLATFORMS = ["darwin", "win32", "linux"];
 var STARTING_TIMEOUT_WAIT_CYLCE = 2e3;
-var STARTING_TIMEOUT_ATTEMPTS = 60;
+var STARTING_TIMEOUT_ATTEMPTS = 120;
 
 // src/lib/clients/jsonRpcClient.ts
 var JsonRpcClient = class {
@@ -43632,7 +43638,8 @@ function downloadSimulator() {
     try {
       yield executeCommand(`git clone ${DEFAULT_REPO_GH_URL} ${simulatorLocation}`, "git");
     } catch (error) {
-      if (error.toString().includes("already exists and is not an empty directory")) {
+      const simulatorLocationExists = fs2.existsSync(simulatorLocation);
+      if (simulatorLocationExists) {
         return { wasInstalled: true };
       }
       throw error;
@@ -43643,14 +43650,7 @@ function downloadSimulator() {
 function updateSimulator() {
   return __async(this, null, function* () {
     const simulatorLocation = getSimulatorLocation();
-    try {
-      yield executeCommand(`cd ${simulatorLocation} && git pull`, "git");
-    } catch (error) {
-      if (error.toString().includes("already exists and is not an empty directory")) {
-        return { wasInstalled: true };
-      }
-      throw error;
-    }
+    yield executeCommand(`cd ${simulatorLocation} && git pull`, "git");
     return { wasInstalled: false };
   });
 }
@@ -43776,7 +43776,7 @@ function initializeGeneralCommands(program2) {
 }
 
 // src/index.ts
-program.version("0.0.1").description(CLI_DESCRIPTION);
+program.version(version).description(CLI_DESCRIPTION);
 initializeGeneralCommands(program);
 program.parse(process.argv);
 /*! Bundled license information:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genlayer",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "description": "GenLayer Command Line Tool",
   "main": "src/index.ts",
   "bin": {

package/src/index.ts

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import {program} from "commander";
-
+import {version} from "../package.json";
 import {CLI_DESCRIPTION} from "@/lib/config/text";
 import {initializeGeneralCommands} from "@/commands/general";
 
-program.version("0.0.1").description(CLI_DESCRIPTION);
+program.version(version).description(CLI_DESCRIPTION);
 
 initializeGeneralCommands(program);
 

package/src/lib/config/simulator.ts

@@ -3,9 +3,9 @@ export const DEFAULT_REPO_GH_URL = "git@github.com:yeagerai/genlayer-simulator.g
 export const DEFAULT_RUN_SIMULATOR_COMMAND = (simulatorLocation: string) => ({
   darwin: `osascript -e 'tell application "Terminal" to do script "cd ${simulatorLocation} && cp .env.example .env && docker compose build && docker compose up"'`,
   win32: `start cmd.exe /k "cd ${simulatorLocation} && xcopy .env.example .env && docker compose build && docker compose up"`,
-  linux: `x-terminal-emulator -e 'bash -c "cd ${simulatorLocation} && cp .env.example .env && docker compose build && docker compose up"'`,
+  linux: `x-terminal-emulator -e bash -c 'cd ${simulatorLocation} && cp .env.example .env && docker compose build && docker compose up; echo "Press enter to exit"; read'`,
 });
 export const AVAILABLE_PLATFORMS = ["darwin", "win32", "linux"] as const;
 export type RunningPlatform = (typeof AVAILABLE_PLATFORMS)[number];
 export const STARTING_TIMEOUT_WAIT_CYLCE = 2000;
-export const STARTING_TIMEOUT_ATTEMPTS = 60;
+export const STARTING_TIMEOUT_ATTEMPTS = 120;

package/src/lib/services/simulator.ts

@@ -1,3 +1,5 @@
+import * as fs from "fs";
+
 import {rpcClient} from "@/lib/clients/jsonRpcClient";
 import {
   DEFAULT_REPO_GH_URL,
@@ -59,7 +61,8 @@ export async function downloadSimulator(): Promise<DownloadSimulatorResultType>
   try {
     await executeCommand(`git clone ${DEFAULT_REPO_GH_URL} ${simulatorLocation}`, "git");
   } catch (error: any) {
-    if (error.toString().includes("already exists and is not an empty directory")) {
+    const simulatorLocationExists = fs.existsSync(simulatorLocation);
+    if (simulatorLocationExists) {
       return {wasInstalled: true};
     }
     throw error;
@@ -69,15 +72,7 @@ export async function downloadSimulator(): Promise<DownloadSimulatorResultType>
 
 export async function updateSimulator(): Promise<DownloadSimulatorResultType> {
   const simulatorLocation = getSimulatorLocation();
-
-  try {
-    await executeCommand(`cd ${simulatorLocation} && git pull`, "git");
-  } catch (error: any) {
-    if (error.toString().includes("already exists and is not an empty directory")) {
-      return {wasInstalled: true};
-    }
-    throw error;
-  }
+  await executeCommand(`cd ${simulatorLocation} && git pull`, "git");
   return {wasInstalled: false};
 }
 

package/tsconfig.json

@@ -45,7 +45,7 @@
     // "resolvePackageJsonExports": true,                /* Use the package.json 'exports' field when resolving package imports. */
     // "resolvePackageJsonImports": true,                /* Use the package.json 'imports' field when resolving imports. */
     // "customConditions": [],                           /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
-    // "resolveJsonModule": true,                        /* Enable importing .json files. */
+    "resolveJsonModule": true /* Enable importing .json files. */,
     // "allowArbitraryExtensions": true,                 /* Enable importing files with any extension, provided a declaration file is present. */
     // "noResolve": true,                                /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */