genlayer 0.0.21 → 0.0.23

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 
 
+## 0.0.23 (2024-05-01)
+
+
+### Bug Fixes
+
+* windows installation ([#19](https://github.com/yeagerai/genlayer-cli/issues/19)) ([3eafe6d](https://github.com/yeagerai/genlayer-cli/commit/3eafe6df9f5f657139177a588d6d53a652a25bd3))
+
+## 0.0.22 (2024-04-30)
+
+
+### Bug Fixes
+
+* running on windows ([#18](https://github.com/yeagerai/genlayer-cli/issues/18)) ([5017bb6](https://github.com/yeagerai/genlayer-cli/commit/5017bb68b7cbfd1f18b73cf36db9f925207a708d))
+
 ## 0.0.21 (2024-04-30)
 
 ## 0.0.20 (2024-04-26)

package/README.md

@@ -26,6 +26,21 @@ This command will download the necessary components and start the simulator. Onc
 
 Contributions to the GenLayer CLI are welcome! Please feel free to fork the repository, make your changes, and submit a pull request. We appreciate your efforts to improve the software.
 
+### Running the CLI from the repository
+
+First, install the dependencies and start the build process
+```bash
+npm install
+npm run dev
+```
+This will continuously rebuild the CLI from the source
+
+Then in another window execute the CLI commands like so:
+
+```bash
+node dist/index.js init
+```
+
 ## License
 
 This project is licensed under the ... License - see the [LICENSE](LICENSE) file for details.

package/dist/index.js

@@ -1051,7 +1051,7 @@ var require_command = __commonJS({
     "use strict";
     var EventEmitter = require("events").EventEmitter;
     var childProcess = require("child_process");
-    var path = require("path");
+    var path2 = require("path");
     var fs3 = require("fs");
     var process4 = require("process");
     var { Argument: Argument2, humanReadableArgName } = require_argument();
@@ -1950,10 +1950,10 @@ Expecting one of '${allowedValues.join("', '")}'`);
         let launchWithNode = false;
         const sourceExt = [".js", ".ts", ".tsx", ".mjs", ".cjs"];
         function findFile(baseDir, baseName) {
-          const localBin = path.resolve(baseDir, baseName);
+          const localBin = path2.resolve(baseDir, baseName);
           if (fs3.existsSync(localBin))
             return localBin;
-          if (sourceExt.includes(path.extname(baseName)))
+          if (sourceExt.includes(path2.extname(baseName)))
             return void 0;
           const foundExt = sourceExt.find((ext) => fs3.existsSync(`${localBin}${ext}`));
           if (foundExt)
@@ -1971,19 +1971,19 @@ Expecting one of '${allowedValues.join("', '")}'`);
           } catch (err) {
             resolvedScriptPath = this._scriptPath;
           }
-          executableDir = path.resolve(path.dirname(resolvedScriptPath), executableDir);
+          executableDir = path2.resolve(path2.dirname(resolvedScriptPath), executableDir);
         }
         if (executableDir) {
           let localFile = findFile(executableDir, executableFile);
           if (!localFile && !subcommand._executableFile && this._scriptPath) {
-            const legacyName = path.basename(this._scriptPath, path.extname(this._scriptPath));
+            const legacyName = path2.basename(this._scriptPath, path2.extname(this._scriptPath));
             if (legacyName !== this._name) {
               localFile = findFile(executableDir, `${legacyName}-${subcommand._name}`);
             }
           }
           executableFile = localFile || executableFile;
         }
-        launchWithNode = sourceExt.includes(path.extname(executableFile));
+        launchWithNode = sourceExt.includes(path2.extname(executableFile));
         let proc;
         if (process4.platform !== "win32") {
           if (launchWithNode) {
@@ -2793,7 +2793,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @return {Command}
        */
       nameFromFilename(filename) {
-        this._name = path.basename(filename, path.extname(filename));
+        this._name = path2.basename(filename, path2.extname(filename));
         return this;
       }
       /**
@@ -2807,10 +2807,10 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @param {string} [path]
        * @return {(string|null|Command)}
        */
-      executableDir(path2) {
-        if (path2 === void 0)
+      executableDir(path3) {
+        if (path3 === void 0)
           return this._executableDir;
-        this._executableDir = path2;
+        this._executableDir = path3;
         return this;
       }
       /**
@@ -15913,11 +15913,11 @@ var require_baseGet = __commonJS({
     "use strict";
     var castPath = require_castPath();
     var toKey = require_toKey();
-    function baseGet(object, path) {
-      path = castPath(path, object);
-      var index = 0, length = path.length;
+    function baseGet(object, path2) {
+      path2 = castPath(path2, object);
+      var index = 0, length = path2.length;
       while (object != null && index < length) {
-        object = object[toKey(path[index++])];
+        object = object[toKey(path2[index++])];
       }
       return index && index == length ? object : void 0;
     }
@@ -15930,8 +15930,8 @@ var require_get = __commonJS({
   "node_modules/lodash/get.js"(exports2, module2) {
     "use strict";
     var baseGet = require_baseGet();
-    function get2(object, path, defaultValue) {
-      var result = object == null ? void 0 : baseGet(object, path);
+    function get2(object, path2, defaultValue) {
+      var result = object == null ? void 0 : baseGet(object, path2);
       return result === void 0 ? defaultValue : result;
     }
     module2.exports = get2;
@@ -15959,11 +15959,11 @@ var require_hasPath = __commonJS({
     var isIndex = require_isIndex();
     var isLength = require_isLength();
     var toKey = require_toKey();
-    function hasPath(object, path, hasFunc) {
-      path = castPath(path, object);
-      var index = -1, length = path.length, result = false;
+    function hasPath(object, path2, hasFunc) {
+      path2 = castPath(path2, object);
+      var index = -1, length = path2.length, result = false;
       while (++index < length) {
-        var key = toKey(path[index]);
+        var key = toKey(path2[index]);
         if (!(result = object != null && hasFunc(object, key))) {
           break;
         }
@@ -15985,8 +15985,8 @@ var require_hasIn = __commonJS({
     "use strict";
     var baseHasIn = require_baseHasIn();
     var hasPath = require_hasPath();
-    function hasIn(object, path) {
-      return object != null && hasPath(object, path, baseHasIn);
+    function hasIn(object, path2) {
+      return object != null && hasPath(object, path2, baseHasIn);
     }
     module2.exports = hasIn;
   }
@@ -16005,13 +16005,13 @@ var require_baseMatchesProperty = __commonJS({
     var toKey = require_toKey();
     var COMPARE_PARTIAL_FLAG = 1;
     var COMPARE_UNORDERED_FLAG = 2;
-    function baseMatchesProperty(path, srcValue) {
-      if (isKey(path) && isStrictComparable(srcValue)) {
-        return matchesStrictComparable(toKey(path), srcValue);
+    function baseMatchesProperty(path2, srcValue) {
+      if (isKey(path2) && isStrictComparable(srcValue)) {
+        return matchesStrictComparable(toKey(path2), srcValue);
       }
       return function(object) {
-        var objValue = get2(object, path);
-        return objValue === void 0 && objValue === srcValue ? hasIn(object, path) : baseIsEqual(srcValue, objValue, COMPARE_PARTIAL_FLAG | COMPARE_UNORDERED_FLAG);
+        var objValue = get2(object, path2);
+        return objValue === void 0 && objValue === srcValue ? hasIn(object, path2) : baseIsEqual(srcValue, objValue, COMPARE_PARTIAL_FLAG | COMPARE_UNORDERED_FLAG);
       };
     }
     module2.exports = baseMatchesProperty;
@@ -16036,9 +16036,9 @@ var require_basePropertyDeep = __commonJS({
   "node_modules/lodash/_basePropertyDeep.js"(exports2, module2) {
     "use strict";
     var baseGet = require_baseGet();
-    function basePropertyDeep(path) {
+    function basePropertyDeep(path2) {
       return function(object) {
-        return baseGet(object, path);
+        return baseGet(object, path2);
       };
     }
     module2.exports = basePropertyDeep;
@@ -16053,8 +16053,8 @@ var require_property = __commonJS({
     var basePropertyDeep = require_basePropertyDeep();
     var isKey = require_isKey();
     var toKey = require_toKey();
-    function property(path) {
-      return isKey(path) ? baseProperty(toKey(path)) : basePropertyDeep(path);
+    function property(path2) {
+      return isKey(path2) ? baseProperty(toKey(path2)) : basePropertyDeep(path2);
     }
     module2.exports = property;
   }
@@ -17152,15 +17152,15 @@ var require_route = __commonJS({
       };
     }
     function wrapConversion(toModel, graph) {
-      const path = [graph[toModel].parent, toModel];
+      const path2 = [graph[toModel].parent, toModel];
       let fn = conversions[graph[toModel].parent][toModel];
       let cur = graph[toModel].parent;
       while (graph[cur].parent) {
-        path.unshift(graph[cur].parent);
+        path2.unshift(graph[cur].parent);
         fn = link(conversions[graph[cur].parent][cur], fn);
         cur = graph[cur].parent;
       }
-      fn.conversion = path;
+      fn.conversion = path2;
       return fn;
     }
     module2.exports = function(fromModel) {
@@ -20159,7 +20159,7 @@ var require_buffer_list = __commonJS({
         }
       }, {
         key: "join",
-        value: function join(s2) {
+        value: function join2(s2) {
           if (this.length === 0)
             return "";
           var p = this.head;
@@ -32681,16 +32681,16 @@ var require_os_tmpdir = __commonJS({
     var isWindows = process.platform === "win32";
     var trailingSlashRe = isWindows ? /[^:]\\$/ : /.\/$/;
     module2.exports = function() {
-      var path;
+      var path2;
       if (isWindows) {
-        path = process.env.TEMP || process.env.TMP || (process.env.SystemRoot || process.env.windir) + "\\temp";
+        path2 = process.env.TEMP || process.env.TMP || (process.env.SystemRoot || process.env.windir) + "\\temp";
       } else {
-        path = process.env.TMPDIR || process.env.TMP || process.env.TEMP || "/tmp";
+        path2 = process.env.TMPDIR || process.env.TMP || process.env.TEMP || "/tmp";
       }
-      if (trailingSlashRe.test(path)) {
-        path = path.slice(0, -1);
+      if (trailingSlashRe.test(path2)) {
+        path2 = path2.slice(0, -1);
       }
-      return path;
+      return path2;
     };
   }
 });
@@ -32700,7 +32700,7 @@ var require_tmp = __commonJS({
   "node_modules/tmp/lib/tmp.js"(exports2, module2) {
     "use strict";
     var fs3 = require("fs");
-    var path = require("path");
+    var path2 = require("path");
     var crypto3 = require("crypto");
     var osTmpDir = require_os_tmpdir();
     var _c = process.binding("constants");
@@ -32742,7 +32742,7 @@ var require_tmp = __commonJS({
     }
     function _generateTmpName(opts) {
       if (opts.name) {
-        return path.join(opts.dir || tmpDir, opts.name);
+        return path2.join(opts.dir || tmpDir, opts.name);
       }
       if (opts.template) {
         return opts.template.replace(TEMPLATE_PATTERN, _randomChars(6));
@@ -32753,7 +32753,7 @@ var require_tmp = __commonJS({
         _randomChars(12),
         opts.postfix || ""
       ].join("");
-      return path.join(opts.dir || tmpDir, name);
+      return path2.join(opts.dir || tmpDir, name);
     }
     function tmpName(options, callback) {
       var args = _parseArguments(options, callback), opts = args[0], cb = args[1], tries = opts.name ? 1 : opts.tries || DEFAULT_TRIES;
@@ -32841,7 +32841,7 @@ var require_tmp = __commonJS({
       do {
         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 = fs3.lstatSync(file2);
+          var file2 = path2.join(dir2, files[i2]), stat2 = fs3.lstatSync(file2);
           if (stat2.isDirectory()) {
             if (!deferred) {
               deferred = true;
@@ -34377,14 +34377,14 @@ var require_baseSet = __commonJS({
     var isIndex = require_isIndex();
     var isObject = require_isObject();
     var toKey = require_toKey();
-    function baseSet(object, path, value, customizer) {
+    function baseSet(object, path2, value, customizer) {
       if (!isObject(object)) {
         return object;
       }
-      path = castPath(path, object);
-      var index = -1, length = path.length, lastIndex = length - 1, nested = object;
+      path2 = castPath(path2, object);
+      var index = -1, length = path2.length, lastIndex = length - 1, nested = object;
       while (nested != null && ++index < length) {
-        var key = toKey(path[index]), newValue = value;
+        var key = toKey(path2[index]), newValue = value;
         if (key === "__proto__" || key === "constructor" || key === "prototype") {
           return object;
         }
@@ -34392,7 +34392,7 @@ var require_baseSet = __commonJS({
           var objValue = nested[key];
           newValue = customizer ? customizer(objValue, key, nested) : void 0;
           if (newValue === void 0) {
-            newValue = isObject(objValue) ? objValue : isIndex(path[index + 1]) ? [] : {};
+            newValue = isObject(objValue) ? objValue : isIndex(path2[index + 1]) ? [] : {};
           }
         }
         assignValue(nested, key, newValue);
@@ -34409,8 +34409,8 @@ var require_set = __commonJS({
   "node_modules/lodash/set.js"(exports2, module2) {
     "use strict";
     var baseSet = require_baseSet();
-    function set2(object, path, value) {
-      return object == null ? object : baseSet(object, path, value);
+    function set2(object, path2, value) {
+      return object == null ? object : baseSet(object, path2, value);
     }
     module2.exports = set2;
   }
@@ -34492,7 +34492,7 @@ var require_main2 = __commonJS({
   "node_modules/dotenv/lib/main.js"(exports2, module2) {
     "use strict";
     var fs3 = require("fs");
-    var path = require("path");
+    var path2 = require("path");
     var os3 = require("os");
     var crypto3 = require("crypto");
     var packageJson = require_package();
@@ -34606,7 +34606,7 @@ var require_main2 = __commonJS({
           possibleVaultPath = options.path.endsWith(".vault") ? options.path : `${options.path}.vault`;
         }
       } else {
-        possibleVaultPath = path.resolve(process.cwd(), ".env.vault");
+        possibleVaultPath = path2.resolve(process.cwd(), ".env.vault");
       }
       if (fs3.existsSync(possibleVaultPath)) {
         return possibleVaultPath;
@@ -34614,7 +34614,7 @@ var require_main2 = __commonJS({
       return null;
     }
     function _resolveHome(envPath) {
-      return envPath[0] === "~" ? path.join(os3.homedir(), envPath.slice(1)) : envPath;
+      return envPath[0] === "~" ? path2.join(os3.homedir(), envPath.slice(1)) : envPath;
     }
     function _configVault(options) {
       _log("Loading env from encrypted .env.vault");
@@ -34627,7 +34627,7 @@ var require_main2 = __commonJS({
       return { parsed };
     }
     function configDotenv(options) {
-      const dotenvPath = path.resolve(process.cwd(), ".env");
+      const dotenvPath = path2.resolve(process.cwd(), ".env");
       let encoding = "utf8";
       const debug = Boolean(options && options.debug);
       if (options && options.encoding) {
@@ -34650,13 +34650,13 @@ var require_main2 = __commonJS({
       }
       let lastError;
       const parsedAll = {};
-      for (const path2 of optionPaths) {
+      for (const path3 of optionPaths) {
         try {
-          const parsed = DotenvModule.parse(fs3.readFileSync(path2, { encoding }));
+          const parsed = DotenvModule.parse(fs3.readFileSync(path3, { encoding }));
           DotenvModule.populate(parsedAll, parsed, options);
         } catch (e2) {
           if (debug) {
-            _debug(`Failed to load ${path2} ${e2.message}`);
+            _debug(`Failed to load ${path3} ${e2.message}`);
           }
           lastError = e2;
         }
@@ -39895,7 +39895,7 @@ var {
 } = import_index.default;
 
 // package.json
-var version = "0.0.21";
+var version = "0.0.23";
 
 // 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.";
@@ -42489,33 +42489,29 @@ var inquirer_default = inquirer;
 
 // src/lib/config/simulator.ts
 var DEFAULT_JSON_RPC_URL = "http://localhost:4000/api";
-var DEFAULT_REPO_GH_URL = "git@github.com:yeagerai/genlayer-simulator.git";
-var DEFAULT_CONFIG_SIMULATOR_COMMAND = (simulatorLocation) => ({
-  darwin: `cd ${simulatorLocation} && cp .env.example .env`,
-  win32: `cd ${simulatorLocation} && xcopy .env.example .env`,
-  linux: `cd ${simulatorLocation} && cp .env.example .env`
-});
+var DEFAULT_REPO_GH_URL = "https://github.com/yeagerai/genlayer-simulator.git";
 var DEFAULT_RUN_SIMULATOR_COMMAND = (simulatorLocation) => ({
   darwin: `osascript -e 'tell application "Terminal" to do script "cd ${simulatorLocation} && docker compose build && docker compose up"'`,
-  win32: `start cmd.exe /k "cd ${simulatorLocation} && docker compose build && docker compose up"`,
+  win32: `start cmd.exe /c "cd /d ${simulatorLocation} && docker compose build && docker compose up && pause"`,
   linux: `x-terminal-emulator -e bash -c 'cd ${simulatorLocation} && docker compose build && docker compose up; echo "Press enter to exit"; read'`
 });
-var DEFAULT_RUN_OLLAMA_COMMAND = (simulatorLocation) => ({
-  darwin: `osascript -e 'tell application "Terminal" to do script "cd ${simulatorLocation} && docker exec -it ollama ollama run llama2"'`,
-  win32: `start cmd.exe /k "cd ${simulatorLocation} && docker exec -it ollama ollama run llama2"`,
-  linux: `x-terminal-emulator -e bash -c 'cd ${simulatorLocation} && docker exec -it ollama ollama run llama2; echo "Press enter to exit"; read'`
+var DEFAULT_PULL_OLLAMA_COMMAND = (simulatorLocation) => ({
+  darwin: `osascript -e 'tell application "Terminal" to do script "cd ${simulatorLocation} && docker exec ollama ollama pull llama2"'`,
+  win32: `start cmd.exe /c "cd /d ${simulatorLocation} && docker exec ollama ollama pull llama2"`,
+  linux: `x-terminal-emulator -e bash -c 'cd ${simulatorLocation} && docker exec ollama ollama pull llama2'`
 });
 var AVAILABLE_PLATFORMS = ["darwin", "win32", "linux"];
 var STARTING_TIMEOUT_WAIT_CYLCE = 2e3;
 var STARTING_TIMEOUT_ATTEMPTS = 120;
 var AI_PROVIDERS_CONFIG = {
-  ollama: { name: "Ollama", envVar: "ollama", cliOptionValue: "ollama" },
-  openai: { name: "OpenAI", envVar: "GENVMOPENAIKEY", cliOptionValue: "openai" }
+  ollama: { name: "Ollama (This will download and run a local instance of Llama 2)", envVar: "ollama", cliOptionValue: "ollama" },
+  openai: { name: "OpenAI (You will need to provide an OpenAI API key)", envVar: "GENVMOPENAIKEY", cliOptionValue: "openai" }
 };
 
 // src/lib/services/simulator.ts
 var fs2 = __toESM(require("fs"));
 var dotenv = __toESM(require_main2());
+var path = __toESM(require("path"));
 
 // node_modules/node-fetch/src/index.js
 var import_node_http2 = __toESM(require("http"), 1);
@@ -43958,14 +43954,20 @@ function getPlatform() {
 
 // src/lib/services/simulator.ts
 function getSimulatorLocation() {
-  return `${getHomeDirectory()}/genlayer-simulator`;
+  return path.join(getHomeDirectory(), "genlayer-simulator");
+}
+function readEnvConfigValue(key) {
+  const simulatorLocation = getSimulatorLocation();
+  const envFilePath = path.join(simulatorLocation, ".env");
+  const envConfig = dotenv.parse(fs2.readFileSync(envFilePath, "utf8"));
+  return envConfig[key];
 }
 function sleep(millliseconds) {
   return new Promise((resolve) => setTimeout(resolve, millliseconds));
 }
 function addConfigToEnvFile(newConfig) {
   const simulatorLocation = getSimulatorLocation();
-  const envFilePath = `${simulatorLocation}/.env`;
+  const envFilePath = path.join(simulatorLocation, ".env");
   fs2.writeFileSync(`${envFilePath}.bak`, fs2.readFileSync(envFilePath));
   const envConfig = dotenv.parse(fs2.readFileSync(envFilePath, "utf8"));
   Object.keys(newConfig).forEach((key) => {
@@ -44021,16 +44023,16 @@ function downloadSimulator() {
 function updateSimulator() {
   return __async(this, null, function* () {
     const simulatorLocation = getSimulatorLocation();
-    const gitCommand = `cd ${simulatorLocation} && git pull`;
+    const gitCommand = `git -C  "${simulatorLocation}" pull`;
     const cmdsByPlatform = { darwin: gitCommand, win32: gitCommand, linux: gitCommand };
     yield executeCommand(cmdsByPlatform, "git");
     return { wasInstalled: false };
   });
 }
-function runOllamaModel() {
+function pullOllamaModel() {
   return __async(this, null, function* () {
     const simulatorLocation = getSimulatorLocation();
-    const cmdsByPlatform = DEFAULT_RUN_OLLAMA_COMMAND(simulatorLocation);
+    const cmdsByPlatform = DEFAULT_PULL_OLLAMA_COMMAND(simulatorLocation);
     yield executeCommandInNewTerminal(cmdsByPlatform);
     return true;
   });
@@ -44038,8 +44040,9 @@ function runOllamaModel() {
 function configSimulator(newConfig) {
   return __async(this, null, function* () {
     const simulatorLocation = getSimulatorLocation();
-    const commandsByPlatform = DEFAULT_CONFIG_SIMULATOR_COMMAND(simulatorLocation);
-    yield executeCommand(commandsByPlatform, "copy (cp)");
+    const envExample = path.join(simulatorLocation, ".env.example");
+    const envFilePath = path.join(simulatorLocation, ".env");
+    fs2.copyFileSync(envExample, envFilePath);
     addConfigToEnvFile(newConfig);
     return true;
   });
@@ -44051,7 +44054,7 @@ function runSimulator() {
 }
 function waitForSimulatorToBeReady() {
   return __async(this, arguments, function* (retries = STARTING_TIMEOUT_ATTEMPTS) {
-    console.log("Waiting for Simulator to be ready...:");
+    console.log("Waiting for the simulator to start up...");
     try {
       const response = yield rpcClient.request({ method: "ping", params: [] });
       if (response && response.result.status === "OK") {
@@ -44124,7 +44127,7 @@ function initAction(options) {
       {
         type: "confirm",
         name: "confirmDownload",
-        message: `This action is going to download the GenLayer Simulator from GitHub. Do you want to continue?`,
+        message: `This action is going to download the GenLayer Simulator from GitHub into "${getSimulatorLocation()}". Do you want to continue?`,
         default: true
       }
     ]);
@@ -44188,7 +44191,7 @@ function initAction(options) {
     }
     console.log("Running the GenLayer Simulator...");
     try {
-      yield runSimulator();
+      runSimulator();
     } catch (error) {
       console.error(error);
       return;
@@ -44201,7 +44204,7 @@ function initAction(options) {
       }
       if (!initialized && error === "TIMEOUT") {
         console.error(
-          "The simulator is taking too lonk to initialize. Please try again after the simulator is ready."
+          "The simulator is taking too long to initialize. Please try again after the simulator is ready."
         );
         return;
       }
@@ -44211,7 +44214,8 @@ function initAction(options) {
       return;
     }
     if (selectedLlmProviders.includes("ollama")) {
-      yield runOllamaModel();
+      console.log("Pulling llama2 from Ollama...");
+      yield pullOllamaModel();
     }
     console.log("Initializing the database...");
     try {
@@ -44234,7 +44238,8 @@ function initAction(options) {
       console.error(error);
       return;
     }
-    console.log("GenLayer simulator initialized successfully!");
+    const frontendPort = readEnvConfigValue("FRONTEND_PORT");
+    console.log(`GenLayer simulator initialized successfully! Go to http://localhost:${frontendPort} in your browser to access it.`);
   });
 }
 

package/package.json

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

package/src/commands/general/init.ts

@@ -12,8 +12,10 @@ import {
   clearDatabaseTables,
   createRandomValidators,
   deleteAllValidators,
-  runOllamaModel,
+  pullOllamaModel,
   getAiProvidersOptions,
+  getSimulatorLocation,
+  readEnvConfigValue,
 } from "@/lib/services/simulator";
 export interface InitActionOptions {
   numValidators: number;
@@ -53,7 +55,7 @@ export async function initAction(options: InitActionOptions) {
     {
       type: "confirm",
       name: "confirmDownload",
-      message: `This action is going to download the GenLayer Simulator from GitHub. Do you want to continue?`,
+      message: `This action is going to download the GenLayer Simulator from GitHub into "${getSimulatorLocation()}". Do you want to continue?`,
       default: true,
     },
   ]);
@@ -130,7 +132,7 @@ export async function initAction(options: InitActionOptions) {
   // Run the GenLayer Simulator
   console.log("Running the GenLayer Simulator...");
   try {
-    await runSimulator();
+    runSimulator();
   } catch (error) {
     console.error(error);
     return;
@@ -144,7 +146,7 @@ export async function initAction(options: InitActionOptions) {
     }
     if (!initialized && error === "TIMEOUT") {
       console.error(
-        "The simulator is taking too lonk to initialize. Please try again after the simulator is ready.",
+        "The simulator is taking too long to initialize. Please try again after the simulator is ready.",
       );
       return;
     }
@@ -156,7 +158,8 @@ export async function initAction(options: InitActionOptions) {
 
   // Ollama doesn't need changes in configuration, we just run it
   if (selectedLlmProviders.includes("ollama")) {
-    await runOllamaModel();
+    console.log("Pulling llama2 from Ollama...")
+    await pullOllamaModel();
   }
 
   // Initialize the database
@@ -187,6 +190,7 @@ export async function initAction(options: InitActionOptions) {
     console.error(error);
     return;
   }
-
-  console.log("GenLayer simulator initialized successfully!");
+  
+  const frontendPort = readEnvConfigValue('FRONTEND_PORT');
+  console.log(`GenLayer simulator initialized successfully! Go to http://localhost:${frontendPort} in your browser to access it.`);
 }

package/src/lib/config/simulator.ts

@@ -1,19 +1,14 @@
 export const DEFAULT_JSON_RPC_URL = "http://localhost:4000/api";
-export const DEFAULT_REPO_GH_URL = "git@github.com:yeagerai/genlayer-simulator.git";
-export const DEFAULT_CONFIG_SIMULATOR_COMMAND = (simulatorLocation: string) => ({
-  darwin: `cd ${simulatorLocation} && cp .env.example .env`,
-  win32: `cd ${simulatorLocation} && xcopy .env.example .env`,
-  linux: `cd ${simulatorLocation} && cp .env.example .env`,
-});
+export const DEFAULT_REPO_GH_URL = "https://github.com/yeagerai/genlayer-simulator.git";
 export const DEFAULT_RUN_SIMULATOR_COMMAND = (simulatorLocation: string) => ({
   darwin: `osascript -e 'tell application "Terminal" to do script "cd ${simulatorLocation} && docker compose build && docker compose up"'`,
-  win32: `start cmd.exe /k "cd ${simulatorLocation} && docker compose build && docker compose up"`,
+  win32: `start cmd.exe /c "cd /d ${simulatorLocation} && docker compose build && docker compose up && pause"`,
   linux: `x-terminal-emulator -e bash -c 'cd ${simulatorLocation} && docker compose build && docker compose up; echo "Press enter to exit"; read'`,
 });
-export const DEFAULT_RUN_OLLAMA_COMMAND = (simulatorLocation: string) => ({
-  darwin: `osascript -e 'tell application "Terminal" to do script "cd ${simulatorLocation} && docker exec -it ollama ollama run llama2"'`,
-  win32: `start cmd.exe /k "cd ${simulatorLocation} && docker exec -it ollama ollama run llama2"`,
-  linux: `x-terminal-emulator -e bash -c 'cd ${simulatorLocation} && docker exec -it ollama ollama run llama2; echo "Press enter to exit"; read'`,
+export const DEFAULT_PULL_OLLAMA_COMMAND = (simulatorLocation: string) => ({
+  darwin: `osascript -e 'tell application "Terminal" to do script "cd ${simulatorLocation} && docker exec ollama ollama pull llama2"'`,
+  win32: `start cmd.exe /c "cd /d ${simulatorLocation} && docker exec ollama ollama pull llama2"`,
+  linux: `x-terminal-emulator -e bash -c 'cd ${simulatorLocation} && docker exec ollama ollama pull llama2'`,
 });
 export const AVAILABLE_PLATFORMS = ["darwin", "win32", "linux"] as const;
 export type RunningPlatform = (typeof AVAILABLE_PLATFORMS)[number];
@@ -27,6 +22,6 @@ export type AiProvidersConfigType = {
 };
 
 export const AI_PROVIDERS_CONFIG: AiProvidersConfigType = {
-  ollama: {name: "Ollama", envVar: "ollama", cliOptionValue: "ollama"},
-  openai: {name: "OpenAI", envVar: "GENVMOPENAIKEY", cliOptionValue: "openai"},
+  ollama: {name: "Ollama (This will download and run a local instance of Llama 2)", envVar: "ollama", cliOptionValue: "ollama"},
+  openai: {name: "OpenAI (You will need to provide an OpenAI API key)", envVar: "GENVMOPENAIKEY", cliOptionValue: "openai"},
 };

package/src/lib/services/simulator.ts

@@ -1,12 +1,12 @@
 import * as fs from "fs";
 import * as dotenv from "dotenv";
+import * as path from "path";
 
 import {rpcClient} from "@/lib/clients/jsonRpcClient";
 import {
   DEFAULT_REPO_GH_URL,
   DEFAULT_RUN_SIMULATOR_COMMAND,
-  DEFAULT_CONFIG_SIMULATOR_COMMAND,
-  DEFAULT_RUN_OLLAMA_COMMAND,
+  DEFAULT_PULL_OLLAMA_COMMAND,
   STARTING_TIMEOUT_WAIT_CYLCE,
   STARTING_TIMEOUT_ATTEMPTS,
   AI_PROVIDERS_CONFIG,
@@ -20,8 +20,16 @@ import {
 import {MissingRequirementError} from "../errors/missingRequirement";
 
 // Private helper functions
-function getSimulatorLocation(): string {
-  return `${getHomeDirectory()}/genlayer-simulator`;
+export function getSimulatorLocation(): string {
+  return path.join(getHomeDirectory(), 'genlayer-simulator');
+}
+
+export function readEnvConfigValue(key: string): string {
+  const simulatorLocation = getSimulatorLocation();
+  const envFilePath = path.join(simulatorLocation, '.env');
+  // Transform the config string to object
+  const envConfig = dotenv.parse(fs.readFileSync(envFilePath, "utf8"));
+  return envConfig[key];
 }
 
 function sleep(millliseconds: number): Promise<void> {
@@ -30,7 +38,7 @@ function sleep(millliseconds: number): Promise<void> {
 
 function addConfigToEnvFile(newConfig: Record<string, string>): void {
   const simulatorLocation = getSimulatorLocation();
-  const envFilePath = `${simulatorLocation}/.env`;
+  const envFilePath = path.join(simulatorLocation, '.env');
 
   // Create a backup of the original .env file
   fs.writeFileSync(`${envFilePath}.bak`, fs.readFileSync(envFilePath));
@@ -102,23 +110,24 @@ export async function downloadSimulator(): Promise<DownloadSimulatorResultType>
 
 export async function updateSimulator(): Promise<DownloadSimulatorResultType> {
   const simulatorLocation = getSimulatorLocation();
-  const gitCommand = `cd ${simulatorLocation} && git pull`;
+  const gitCommand = `git -C  "${simulatorLocation}" pull`;
   const cmdsByPlatform = {darwin: gitCommand, win32: gitCommand, linux: gitCommand};
   await executeCommand(cmdsByPlatform, "git");
   return {wasInstalled: false};
 }
 
-export async function runOllamaModel(): Promise<boolean> {
+export async function pullOllamaModel(): Promise<boolean> {
   const simulatorLocation = getSimulatorLocation();
-  const cmdsByPlatform = DEFAULT_RUN_OLLAMA_COMMAND(simulatorLocation);
+  const cmdsByPlatform = DEFAULT_PULL_OLLAMA_COMMAND(simulatorLocation);
   await executeCommandInNewTerminal(cmdsByPlatform);
   return true;
 }
 
 export async function configSimulator(newConfig: Record<string, string>): Promise<boolean> {
   const simulatorLocation = getSimulatorLocation();
-  const commandsByPlatform = DEFAULT_CONFIG_SIMULATOR_COMMAND(simulatorLocation);
-  await executeCommand(commandsByPlatform, "copy (cp)");
+  const envExample = path.join(simulatorLocation, '.env.example');
+  const envFilePath = path.join(simulatorLocation, '.env');
+  fs.copyFileSync(envExample, envFilePath);  
   addConfigToEnvFile(newConfig);
   return true;
 }
@@ -137,7 +146,7 @@ type WaitForSimulatorToBeReadyResultType = {
 export async function waitForSimulatorToBeReady(
   retries: number = STARTING_TIMEOUT_ATTEMPTS,
 ): Promise<WaitForSimulatorToBeReadyResultType> {
-  console.log("Waiting for Simulator to be ready...:");
+  console.log("Waiting for the simulator to start up...");
   try {
     const response = await rpcClient.request({method: "ping", params: []});
     if (response && response.result.status === "OK") {