genlayer 0.9.0 → 0.10.0-beta.0

package/.env.example

@@ -69,7 +69,7 @@ VALIDATORS_CONFIG_JSON=''
 
 
 VSCODEDEBUG="false"
-LOCALNETVERSION="latest"
+LOCALNETVERSION="v0.29.0"
 
 FRONTEND_BUILD_TARGET = 'final' # change to 'dev' to run in dev mode
 

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 
 
+## 0.10.0-beta.0 (2024-12-13)
+
+
+### Features
+
+* new global var to deal with compatible version ([33a4c02](https://github.com/yeagerai/genlayer-cli/commit/33a4c02f091e87faf1b884177ee854fe1b66f52b))
+
+## 0.9.1 (2024-12-13)
+
+
+### Bug Fixes
+
+* removing volumes to stop error when running node without nvm ([#156](https://github.com/yeagerai/genlayer-cli/issues/156)) ([189c759](https://github.com/yeagerai/genlayer-cli/commit/189c7592fedb6373e3603f1bdb4366c79f289160))
+
 ## 0.9.0 (2024-12-13)
 
 

package/dist/index.js

@@ -58904,7 +58904,7 @@ var {
 } = import_index.default;
 
 // package.json
-var version = "0.9.0";
+var version = "0.10.0-beta.0";
 var package_default = {
   name: "genlayer",
   version,
@@ -59040,12 +59040,14 @@ function v4(options, buf, offset) {
 var v4_default = v4;
 
 // src/lib/config/simulator.ts
+var localnetCompatibleVersion = "v0.29.0";
 var DEFAULT_JSON_RPC_URL = "http://localhost:4000/api";
-var DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX = "/genlayer-cli-";
+var CONTAINERS_NAME_PREFIX = "/genlayer-";
+var IMAGES_NAME_PREFIX = "yeagerai";
 var DEFAULT_RUN_SIMULATOR_COMMAND = (location, options) => ({
-  darwin: `osascript -e 'tell application "Terminal" to do script "cd ${location} && docker compose build && docker compose up ${options}"'`,
-  win32: `start cmd.exe /c "cd /d ${location} && docker compose build && docker compose up && pause ${options}"`,
-  linux: `nohup bash -c 'cd ${location} && docker compose build && docker compose up -d ${options}'`
+  darwin: `osascript -e 'tell application "Terminal" to do script "cd ${location} && docker compose build && docker compose -p genlayer up ${options}"'`,
+  win32: `start cmd.exe /c "cd /d ${location} && docker compose build && docker compose -p genlayer up ${options} && pause"`,
+  linux: `nohup bash -c 'cd ${location} && docker compose build && docker compose -p genlayer up ${options} -d '`
 });
 var DEFAULT_RUN_DOCKER_COMMAND = {
   darwin: "open -a Docker",
@@ -59637,7 +59639,6 @@ var SimulatorService = class {
   }
   addConfigToEnvFile(newConfig) {
     const envFilePath = path2.join(this.location, ".env");
-    fs5.writeFileSync(`${envFilePath}.bak`, fs5.readFileSync(envFilePath));
     const envConfig = dotenv.parse(fs5.readFileSync(envFilePath, "utf8"));
     Object.keys(newConfig).forEach((key) => {
       envConfig[key] = newConfig[key];
@@ -59793,7 +59794,7 @@ Run npm install -g genlayer to update
     const containers = await this.docker.listContainers({ all: true });
     const genlayerContainers = containers.filter(
       (container) => container.Names.some(
-        (name) => name.startsWith(DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX)
+        (name) => name.startsWith(CONTAINERS_NAME_PREFIX)
       )
     );
     for (const containerInfo of genlayerContainers) {
@@ -59808,7 +59809,7 @@ Run npm install -g genlayer to update
   async resetDockerImages() {
     const images = await this.docker.listImages();
     const genlayerImages = images.filter(
-      (image) => image.RepoTags?.some((tag) => tag.startsWith(DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX))
+      (image) => image.RepoTags?.some((tag) => tag.startsWith(IMAGES_NAME_PREFIX))
     );
     for (const imageInfo of genlayerImages) {
       const image = this.docker.getImage(imageInfo.Id);
@@ -62670,7 +62671,7 @@ async function startAction(options, simulatorService) {
 
 // src/commands/general/index.ts
 function initializeGeneralCommands(program2) {
-  program2.command("init").description("Initialize the GenLayer Environment").option("--numValidators <numValidators>", "Number of validators", "5").option("--headless", "Headless mode", false).option("--reset-db", "Reset Database", false).option("--localnet-version <localnetVersion>", "Select a specific localnet version", "latest").action((options) => initAction(options, simulator_default));
+  program2.command("init").description("Initialize the GenLayer Environment").option("--numValidators <numValidators>", "Number of validators", "5").option("--headless", "Headless mode", false).option("--reset-db", "Reset Database", false).option("--localnet-version <localnetVersion>", "Select a specific localnet version", localnetCompatibleVersion).action((options) => initAction(options, simulator_default));
   program2.command("up").description("Starts GenLayer's simulator").option("--reset-validators", "Remove all current validators and create new random ones", false).option("--numValidators <numValidators>", "Number of validators", "5").option("--headless", "Headless mode", false).option("--reset-db", "Reset Database", false).action((options) => startAction(options, simulator_default));
   return program2;
 }

package/docker-compose.yml

@@ -7,8 +7,8 @@ services:
       - "${FRONTEND_PORT:-8080}:8080"
     environment:
       - VITE_*
-    volumes:
-      - ./.env:/app/.env
+    env_file:
+      - ./.env
     depends_on:
       jsonrpc:
         condition: service_healthy
@@ -36,8 +36,8 @@ services:
     ports:
       - "${RPCPORT:-5000}:${RPCPORT:-5000}"
       - "${RPCDEBUGPORT:-5001}:${RPCDEBUGPORT:-5001}"
-    volumes:
-      - ./.env:/app/.env
+    env_file:
+      - ./.env
     healthcheck:
       test: [ "CMD", "python", "backend/healthcheck.py", "--port", "${RPCPORT}" ]
       interval: 30s
@@ -75,8 +75,8 @@ services:
     expose:
       - "${WEBREQUESTPORT:-5002}:${WEBREQUESTPORT:-5002}"
       - "${WEBREQUESTSELENIUMPORT:-4444}:${WEBREQUESTSELENIUMPORT:-4444}"
-    volumes:
-      - ./.env:/app/webrequest/.env
+    env_file:
+      - ./.env
     depends_on:
       ollama:
         condition: service_started

package/package.json

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

package/src/commands/general/index.ts

@@ -1,7 +1,9 @@
 import { Command } from "commander";
+
 import simulatorService from "../../lib/services/simulator";
 import { initAction, InitActionOptions } from "./init";
 import { startAction, StartActionOptions } from "./start";
+import {localnetCompatibleVersion} from "../../lib/config/simulator";
 
 export function initializeGeneralCommands(program: Command) {
   program
@@ -10,7 +12,7 @@ export function initializeGeneralCommands(program: Command) {
     .option("--numValidators <numValidators>", "Number of validators", "5")
     .option("--headless", "Headless mode", false)
     .option("--reset-db", "Reset Database", false)
-    .option("--localnet-version <localnetVersion>", "Select a specific localnet version", "latest")
+    .option("--localnet-version <localnetVersion>", "Select a specific localnet version", localnetCompatibleVersion)
     .action((options: InitActionOptions) => initAction(options, simulatorService));
 
   program

package/src/commands/general/init.ts

@@ -147,7 +147,6 @@ export async function initAction(options: InitActionOptions, simulatorService: I
   simulatorService.addConfigToEnvFile(aiProvidersEnvVars);
   simulatorService.addConfigToEnvFile({LOCALNETVERSION: localnetVersion});
 
-
   // Run the GenLayer Simulator
   console.log("Running the GenLayer Simulator...");
   try {

package/src/lib/config/simulator.ts

@@ -1,9 +1,11 @@
+export const localnetCompatibleVersion = "v0.29.0";
 export const DEFAULT_JSON_RPC_URL = "http://localhost:4000/api";
-export const DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX = "/genlayer-cli-";
+export const CONTAINERS_NAME_PREFIX = "/genlayer-";
+export const IMAGES_NAME_PREFIX = "yeagerai";
 export const DEFAULT_RUN_SIMULATOR_COMMAND = (location: string, options: string) => ({
-  darwin: `osascript -e 'tell application "Terminal" to do script "cd ${location} && docker compose build && docker compose up ${options}"'`,
-  win32: `start cmd.exe /c "cd /d ${location} && docker compose build && docker compose up && pause ${options}"`,
-  linux: `nohup bash -c 'cd ${location} && docker compose build && docker compose up -d ${options}'`,
+  darwin: `osascript -e 'tell application "Terminal" to do script "cd ${location} && docker compose build && docker compose -p genlayer up ${options}"'`,
+  win32: `start cmd.exe /c "cd /d ${location} && docker compose build && docker compose -p genlayer up ${options} && pause"`,
+  linux: `nohup bash -c 'cd ${location} && docker compose build && docker compose -p genlayer up ${options} -d '`,
 });
 export const DEFAULT_RUN_DOCKER_COMMAND = {
   darwin: "open -a Docker",

package/src/lib/services/simulator.ts

@@ -8,7 +8,6 @@ import pkg from '../../../package.json'
 
 import {rpcClient} from "../clients/jsonRpcClient";
 import {
-  DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX,
   DEFAULT_RUN_SIMULATOR_COMMAND,
   DEFAULT_RUN_DOCKER_COMMAND,
   STARTING_TIMEOUT_WAIT_CYLCE,
@@ -16,6 +15,8 @@ import {
   AI_PROVIDERS_CONFIG,
   AiProviders,
   VERSION_REQUIREMENTS,
+  CONTAINERS_NAME_PREFIX,
+  IMAGES_NAME_PREFIX
 } from "../config/simulator";
 import {
   checkCommand,
@@ -50,9 +51,6 @@ export class SimulatorService implements ISimulatorService {
   public addConfigToEnvFile(newConfig: Record<string, string>): void {
     const envFilePath = path.join(this.location, ".env");
 
-    // Create a backup of the original .env file
-    fs.writeFileSync(`${envFilePath}.bak`, fs.readFileSync(envFilePath));
-
     // Transform the config string to object
     const envConfig = dotenv.parse(fs.readFileSync(envFilePath, "utf8"));
     Object.keys(newConfig).forEach(key => {
@@ -257,7 +255,7 @@ export class SimulatorService implements ISimulatorService {
     const containers = await this.docker.listContainers({ all: true });
     const genlayerContainers = containers.filter(container =>
       container.Names.some(name =>
-        name.startsWith(DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX)
+        name.startsWith(CONTAINERS_NAME_PREFIX)
       )
     );
 
@@ -274,7 +272,7 @@ export class SimulatorService implements ISimulatorService {
   public async resetDockerImages(): Promise<boolean> {
     const images = await this.docker.listImages();
     const genlayerImages = images.filter(image =>
-      image.RepoTags?.some(tag => tag.startsWith(DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX))
+      image.RepoTags?.some(tag => tag.startsWith(IMAGES_NAME_PREFIX))
     );
 
     for (const imageInfo of genlayerImages) {

package/tests/actions/init.test.ts

@@ -7,6 +7,7 @@ import {mkdtempSync} from "fs";
 import {join} from "path";
 import fs from "fs";
 import * as dotenv from "dotenv";
+import {localnetCompatibleVersion} from "../../src/lib/config/simulator";
 
 
 vi.mock("fs");
@@ -14,7 +15,7 @@ vi.mock("dotenv");
 
 
 const tempDir = mkdtempSync(join(tmpdir(), "test-initAction-"));
-const defaultActionOptions = { numValidators: 5, branch: "main", location: tempDir, headless: false, resetDb: false, localnetVersion: 'latest' };
+const defaultActionOptions = { numValidators: 5, branch: "main", location: tempDir, headless: false, resetDb: false, localnetVersion: localnetCompatibleVersion };
 
 describe("init action", () => {
   let error: ReturnType<any>;

package/tests/commands/init.test.ts

@@ -3,13 +3,14 @@ import { vi, describe, beforeEach, afterEach, test, expect } from "vitest";
 import { initializeGeneralCommands } from "../../src/commands/general";
 import { getCommand, getCommandOption } from "../utils";
 import simulatorService from  '../../src/lib/services/simulator'
+import {localnetCompatibleVersion} from "../../src/lib/config/simulator";
 
 const openFrontendSpy = vi.spyOn(simulatorService, "openFrontend");
 const defaultOptions = {
   numValidators: "5",
   headless: false,
   resetDb: false,
-  localnetVersion: 'latest'
+  localnetVersion: localnetCompatibleVersion
 }
 
 vi.mock("inquirer", () => ({

package/tests/services/simulator.test.ts

@@ -10,10 +10,10 @@ import {
   checkCommand,
 } from "../../src/lib/clients/system";
 import {
-  DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX,
+  CONTAINERS_NAME_PREFIX,
   VERSION_REQUIREMENTS,
   STARTING_TIMEOUT_ATTEMPTS,
-  DEFAULT_RUN_SIMULATOR_COMMAND,
+  DEFAULT_RUN_SIMULATOR_COMMAND, localnetCompatibleVersion, IMAGES_NAME_PREFIX,
 } from "../../src/lib/config/simulator";
 import { rpcClient } from "../../src/lib/clients/jsonRpcClient";
 import * as semver from "semver";
@@ -173,7 +173,6 @@ describe("SimulatorService - Basic Tests", () => {
 
     simulatorService.addConfigToEnvFile(newConfig);
 
-    expect(writeFileSyncMock).toHaveBeenCalledWith(`${envFilePath}.bak`, "");
     const expectedUpdatedContent = `NEW_KEY=newValue`;
     expect(writeFileSyncMock).toHaveBeenCalledWith(envFilePath, expectedUpdatedContent);
   });
@@ -376,12 +375,12 @@ describe("SimulatorService - Docker Tests", () => {
     const mockContainers = [
       {
         Id: "container1",
-        Names: [`${DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX}container1`],
+        Names: [`${CONTAINERS_NAME_PREFIX}container1`],
         State: "running",
       },
       {
         Id: "container2",
-        Names: [`${DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX}container2`],
+        Names: [`${CONTAINERS_NAME_PREFIX}container2`],
         State: "exited",
       },
       {
@@ -418,11 +417,11 @@ describe("SimulatorService - Docker Tests", () => {
     const mockImages = [
       {
         Id: "image1",
-        RepoTags: [`${DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX}image1:latest`],
+        RepoTags: [`${IMAGES_NAME_PREFIX}image1:${localnetCompatibleVersion}`],
       },
       {
         Id: "image2",
-        RepoTags: [`${DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX}image2:latest`],
+        RepoTags: [`${IMAGES_NAME_PREFIX}image2:${localnetCompatibleVersion}`],
       },
       {
         Id: "image3",