genlayer 0.20.0 → 0.21.0

package/.env.example

@@ -20,10 +20,8 @@ JSONRPC_REPLICAS='1'         # number of JsonRPC container replicas to run, used
 
 
 # WebRequest Server Configuration
-WEBREQUESTPORT=5000
-WEBREQUESTSELENIUMPORT=5001
-WEBREQUESTPROTOCOL='http'
-WEBREQUESTHOST='webrequest'
+WEBDRIVERHOST=webdriver
+WEBDRIVERPORT=4444
 
 
 # Ollama server details

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.21.0 (2025-07-14)
+
+### Features
+
+* update docker compose ([#237](https://github.com/yeagerai/genlayer-cli/issues/237)) ([18ea508](https://github.com/yeagerai/genlayer-cli/commit/18ea508a155bc9112612430add49c4c0e23ad3d5))
+
 ## 0.20.0 (2025-07-09)
 
 ### Features

package/dist/index.js

@@ -17723,7 +17723,7 @@ var require_semver2 = __commonJS({
 import { program } from "commander";
 
 // package.json
-var version = "0.20.0";
+var version = "0.21.0";
 var package_default = {
   name: "genlayer",
   version,
@@ -17814,7 +17814,7 @@ var CLI_DESCRIPTION = "GenLayer CLI is a development environment for the GenLaye
 import inquirer2 from "inquirer";
 
 // src/lib/config/simulator.ts
-var localnetCompatibleVersion = "v0.55.0";
+var localnetCompatibleVersion = "v0.65.0";
 var DEFAULT_JSON_RPC_URL = "http://localhost:4000/api";
 var CONTAINERS_NAME_PREFIX = "/genlayer-";
 var IMAGES_NAME_PREFIX = "yeagerai";
@@ -41882,6 +41882,19 @@ Run npm install -g genlayer to update
     }
     return version5;
   }
+  compareVersions(version1, version22) {
+    const v1 = version1.replace(/^v/, "");
+    const v2 = version22.replace(/^v/, "");
+    const parts1 = v1.split("-")[0].split(".").map(Number);
+    const parts2 = v2.split("-")[0].split(".").map(Number);
+    for (let i2 = 0; i2 < Math.max(parts1.length, parts2.length); i2++) {
+      const part1 = parts1[i2] || 0;
+      const part2 = parts2[i2] || 0;
+      if (part1 < part2) return -1;
+      if (part1 > part2) return 1;
+    }
+    return 0;
+  }
   async isLocalnetRunning() {
     const genlayerContainers = await this.getGenlayerContainers();
     const runningContainers = genlayerContainers.filter((container) => container.State === "running");
@@ -41925,6 +41938,10 @@ var InitAction = class extends BaseAction {
       let localnetVersion = options.localnetVersion;
       if (localnetVersion !== "latest") {
         localnetVersion = this.simulatorService.normalizeLocalnetVersion(localnetVersion);
+        if (this.simulatorService.compareVersions(localnetVersion, localnetCompatibleVersion) < 0) {
+          this.failSpinner(`Localnet version ${localnetVersion} is not supported. Minimum required version is ${localnetCompatibleVersion}. Please use a newer version.`);
+          return;
+        }
       }
       this.startSpinner("Checking CLI version...");
       await this.simulatorService.checkCliVersion();
@@ -42139,7 +42156,7 @@ var StopAction = class extends BaseAction {
 
 // 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", localnetCompatibleVersion).option("--ollama", "Enable Ollama container", false).action(async (options) => {
+  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 (minimum: ${localnetCompatibleVersion})`, localnetCompatibleVersion).option("--ollama", "Enable Ollama container", false).action(async (options) => {
     const initAction = new InitAction();
     await initAction.execute(options);
   });

package/docker-compose.yml

@@ -32,9 +32,8 @@ services:
       - FLASK_SERVER_PORT=${RPCPORT:-5000}
       - PYTHONUNBUFFERED=1
       - RPCDEBUGPORT=${RPCDEBUGPORT:-5001}
-      - WEBREQUESTPORT=${WEBREQUESTPORT:-5002}
-      - WEBREQUESTHOST=${WEBREQUESTHOST:-localhost}
-      - WEBREQUESTPROTOCOL=${WEBREQUESTPROTOCOL:-http}
+      - WEBDRIVERHOST=${WEBDRIVERHOST:-webdriver}
+      - WEBDRIVERPORT=${WEBDRIVERPORT:-4444}
     ports:
       - "${RPCPORT:-5000}:${RPCPORT:-5000}"
       - "${RPCDEBUGPORT:-5001}:${RPCDEBUGPORT:-5001}"
@@ -49,8 +48,8 @@ services:
     depends_on:
       database-migration:
         condition: service_completed_successfully
-      webrequest:
-        condition: service_healthy
+      webdriver:
+        condition: service_healthy  
     expose:
       - "${RPCPORT:-5000}"
     restart: always
@@ -67,25 +66,14 @@ services:
       - hardhat_artifacts:/app/hardhat/artifacts
       - hardhat_deployments:/app/hardhat/deployments
 
-  webrequest:
-    image: yeagerai/simulator-webrequest:${LOCALNETVERSION:-latest}
+
+  webdriver:
+    image: yeagerai/genlayer-genvm-webdriver:0.0.3
     shm_size: 2gb
     environment:
-      - FLASK_SERVER_PORT=${WEBREQUESTPORT:-5002}
-      - WEBREQUESTSELENIUMPORT=${WEBREQUESTSELENIUMPORT:-4444}
-      - PYTHONUNBUFFERED=1
-      - WEBREQUESTPORT=${WEBREQUESTPORT}
-      - WEBREQUESTHOST=${WEBREQUESTHOST}
-      - WEBREQUESTPROTOCOL=${WEBREQUESTPROTOCOL}
+      - PORT=${WEBDRIVERPORT:-4444}
     expose:
-      - "${WEBREQUESTPORT:-5002}:${WEBREQUESTPORT:-5002}"
-      - "${WEBREQUESTSELENIUMPORT:-4444}:${WEBREQUESTSELENIUMPORT:-4444}"
-    env_file:
-      - ./.env
-    depends_on:
-      ollama:
-        condition: service_started
-        required: false
+      - "${WEBDRIVERPORT:-4444}"
     restart: always
     security_opt:
       - "no-new-privileges=true"
@@ -94,7 +82,7 @@ services:
       options:
         max-size: "10m"
         max-file: "3"
-
+  
   ollama:
     image: ollama/ollama:0.6.6
     ports:
@@ -142,14 +130,9 @@ services:
     image: yeagerai/simulator-database-migration:${LOCALNETVERSION:-latest}
     environment:
       - DB_URL=postgresql://${DBUSER:-postgres}:${DBPASSWORD:-postgres}@postgres/${DBNAME:-simulator_db}
-      - WEBREQUESTPORT=${WEBREQUESTPORT:-5002}
-      - WEBREQUESTHOST=${WEBREQUESTHOST:-localhost}
-      - WEBREQUESTPROTOCOL=${WEBREQUESTPROTOCOL:-http}
     depends_on:
       postgres:
         condition: service_healthy
-      webrequest:
-        condition: service_healthy
 
   hardhat:
     image: yeagerai/simulator-hardhat:${LOCALNETVERSION:-latest}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genlayer",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "GenLayer Command Line Tool",
   "main": "src/index.ts",
   "type": "module",

package/src/commands/general/index.ts

@@ -13,7 +13,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", localnetCompatibleVersion)
+    .option("--localnet-version <localnetVersion>", `Select a specific localnet version (minimum: ${localnetCompatibleVersion})`, localnetCompatibleVersion)
     .option("--ollama", "Enable Ollama container", false)
     .action(async (options: InitActionOptions) => {
       const initAction = new InitAction();

package/src/commands/general/init.ts

@@ -1,7 +1,7 @@
 import inquirer from "inquirer";
 import {DistinctQuestion} from "inquirer";
 import {ISimulatorService} from "../../lib/interfaces/ISimulatorService";
-import {AI_PROVIDERS_CONFIG, AiProviders} from "../../lib/config/simulator";
+import {AI_PROVIDERS_CONFIG, AiProviders, localnetCompatibleVersion} from "../../lib/config/simulator";
 import {OllamaAction} from "../update/ollama";
 import {BaseAction} from "../../lib/actions/BaseAction";
 import {SimulatorService} from "../../lib/services/simulator";
@@ -46,6 +46,11 @@ export class InitAction extends BaseAction {
       let localnetVersion = options.localnetVersion;
       if (localnetVersion !== "latest") {
         localnetVersion = this.simulatorService.normalizeLocalnetVersion(localnetVersion);
+        
+        if (this.simulatorService.compareVersions(localnetVersion, localnetCompatibleVersion) < 0) {
+          this.failSpinner(`Localnet version ${localnetVersion} is not supported. Minimum required version is ${localnetCompatibleVersion}. Please use a newer version.`);
+          return;
+        }
       }
 
       this.startSpinner("Checking CLI version...");

package/src/lib/config/simulator.ts

@@ -1,4 +1,4 @@
-export const localnetCompatibleVersion = "v0.55.0";
+export const localnetCompatibleVersion = "v0.65.0";
 export const DEFAULT_JSON_RPC_URL = "http://localhost:4000/api";
 export const CONTAINERS_NAME_PREFIX = "/genlayer-";
 export const IMAGES_NAME_PREFIX = "yeagerai";

package/src/lib/interfaces/ISimulatorService.ts

@@ -19,6 +19,7 @@ export interface ISimulatorService {
   cleanDatabase(): Promise<boolean>;
   addConfigToEnvFile(newConfig: Record<string, string>): void;
   normalizeLocalnetVersion(version: string): string;
+  compareVersions(version1: string, version2: string): number;
   isLocalnetRunning(): Promise<boolean>;
 }
 

package/src/lib/services/simulator.ts

@@ -305,6 +305,24 @@ export class SimulatorService implements ISimulatorService {
     return version
   }
 
+  public compareVersions(version1: string, version2: string): number {
+    const v1 = version1.replace(/^v/, '');
+    const v2 = version2.replace(/^v/, '');
+    
+    const parts1 = v1.split('-')[0].split('.').map(Number);
+    const parts2 = v2.split('-')[0].split('.').map(Number);
+    
+    for (let i = 0; i < Math.max(parts1.length, parts2.length); i++) {
+      const part1 = parts1[i] || 0;
+      const part2 = parts2[i] || 0;
+      
+      if (part1 < part2) return -1;
+      if (part1 > part2) return 1;
+    }
+    
+    return 0;
+  }
+
   public async isLocalnetRunning(): Promise<boolean> {
     const genlayerContainers = await this.getGenlayerContainers();
     const runningContainers = genlayerContainers.filter(container => container.State === "running");

package/tests/actions/init.test.ts

@@ -3,6 +3,7 @@ import inquirer from "inquirer";
 import {InitAction, InitActionOptions} from "../../src/commands/general/init";
 import {SimulatorService} from "../../src/lib/services/simulator";
 import {OllamaAction} from "../../src/commands/update/ollama";
+import {localnetCompatibleVersion} from "../../src/lib/config/simulator";
 
 describe("InitAction", () => {
   let initAction: InitAction;
@@ -28,7 +29,7 @@ describe("InitAction", () => {
     numValidators: 5,
     headless: false,
     resetDb: false,
-    localnetVersion: "v1.0.0",
+    localnetVersion: localnetCompatibleVersion,
     ollama: false
   };
 
@@ -133,7 +134,7 @@ describe("InitAction", () => {
         OPENAIKEY: "API_KEY_OPENAI",
         HEURISTAIAPIKEY: "API_KEY_HEURIST",
       });
-      expect(addConfigToEnvFileSpy).toHaveBeenCalledWith({LOCALNETVERSION: "v1.0.0"});
+      expect(addConfigToEnvFileSpy).toHaveBeenCalledWith({LOCALNETVERSION: localnetCompatibleVersion});
       expect(runSimulatorSpy).toHaveBeenCalled();
       expect(waitForSimulatorSpy).toHaveBeenCalled();
       expect(deleteAllValidatorsSpy).toHaveBeenCalled();
@@ -155,7 +156,7 @@ describe("InitAction", () => {
         numValidators: 5,
         headless: true,
         resetDb: true,
-        localnetVersion: "v1.0.0",
+        localnetVersion: localnetCompatibleVersion,
         ollama: true
       };
       await initAction.execute(headlessOptions);
@@ -168,7 +169,7 @@ describe("InitAction", () => {
     });
 
     test("normalizes localnetVersion if not 'latest'", async () => {
-      const customVersion = "custom-v1";
+      const customVersion = "v99";
       normalizeLocalnetVersionSpy.mockReturnValue(customVersion);
       inquirerPromptSpy
         .mockResolvedValueOnce({confirmAction: true})
@@ -255,6 +256,49 @@ describe("InitAction", () => {
       );
     });
 
+    test("fails if localnet version is older than compatible version", async () => {
+      const olderVersion = "v0.0.1";
+      normalizeLocalnetVersionSpy.mockReturnValue(olderVersion);
+      await initAction.execute({...defaultOptions, localnetVersion: olderVersion});
+      expect((initAction as any).failSpinner).toHaveBeenCalledWith(
+        `Localnet version ${olderVersion} is not supported. Minimum required version is ${localnetCompatibleVersion}. Please use a newer version.`
+      );
+    });
+
+    test("should proceed when localnet version is equal to compatible version", async () => {
+      normalizeLocalnetVersionSpy.mockReturnValue(localnetCompatibleVersion);
+      inquirerPromptSpy
+        .mockResolvedValueOnce({selectedLlmProviders: ["openai"]})
+        .mockResolvedValueOnce({openai: "API_KEY_OPENAI"});
+      await initAction.execute({...defaultOptions, localnetVersion: localnetCompatibleVersion});
+      expect((initAction as any).failSpinner).not.toHaveBeenCalledWith(
+        expect.stringContaining("Localnet version")
+      );
+    });
+
+    test("should proceed when localnet version is newer than compatible version", async () => {
+      const newerVersion = "v99.99.99";
+      normalizeLocalnetVersionSpy.mockReturnValue(newerVersion);
+      inquirerPromptSpy
+        .mockResolvedValueOnce({selectedLlmProviders: ["openai"]})
+        .mockResolvedValueOnce({openai: "API_KEY_OPENAI"});
+      await initAction.execute({...defaultOptions, localnetVersion: newerVersion});
+      expect((initAction as any).failSpinner).not.toHaveBeenCalledWith(
+        expect.stringContaining("Localnet version")
+      );
+    });
+
+    test("should skip version validation when localnet version is 'latest'", async () => {
+      inquirerPromptSpy
+        .mockResolvedValueOnce({selectedLlmProviders: ["openai"]})
+        .mockResolvedValueOnce({openai: "API_KEY_OPENAI"});
+      await initAction.execute({...defaultOptions, localnetVersion: "latest"});
+      expect(normalizeLocalnetVersionSpy).not.toHaveBeenCalled();
+      expect((initAction as any).failSpinner).not.toHaveBeenCalledWith(
+        expect.stringContaining("Localnet version")
+      );
+    });
+
     test("fails if checkInstallRequirements throws an error", async () => {
       const error = new Error("Install error");
       checkInstallRequirementsSpy.mockRejectedValue(error);

package/tests/commands/init.test.ts

@@ -83,6 +83,16 @@ describe("init command", () => {
     expect(openFrontendSpy).not.toHaveBeenCalled();
   });
 
+  test("option --localnet-version description includes minimum version", async () => {
+    const localnetVersionOption = getCommandOption(initCommand, "--localnet-version");
+    expect(localnetVersionOption?.description).toBe(`Select a specific localnet version (minimum: ${localnetCompatibleVersion})`);
+  });
+
+  test("option --localnet-version default value is compatible version", async () => {
+    const localnetVersionOption = getCommandOption(initCommand, "--localnet-version");
+    expect(localnetVersionOption?.defaultValue).toBe(localnetCompatibleVersion);
+  });
+
   test("option --ollama is accepted", async () => {
     program.parse(["node", "test", "init", "--ollama"]);
     expect(InitAction).toHaveBeenCalledTimes(1);

package/tests/services/simulator.test.ts

@@ -603,3 +603,63 @@ describe("normalizeLocalnetVersion", () => {
     expect(console.error).toHaveBeenCalledWith(mockError);
   });
 });
+
+describe("compareVersions", () => {
+  test("should return 0 when versions are equal", () => {
+    expect(simulatorService.compareVersions("v1.0.0", "v1.0.0")).toBe(0);
+    expect(simulatorService.compareVersions("1.0.0", "v1.0.0")).toBe(0);
+    expect(simulatorService.compareVersions("v1.0.0", "1.0.0")).toBe(0);
+    expect(simulatorService.compareVersions("1.0.0", "1.0.0")).toBe(0);
+  });
+
+  test("should return -1 when first version is less than second", () => {
+    expect(simulatorService.compareVersions("v0.64.0", "v0.65.0")).toBe(-1);
+    expect(simulatorService.compareVersions("v0.65.0", "v0.66.0")).toBe(-1);
+    expect(simulatorService.compareVersions("v0.64.9", "v0.65.0")).toBe(-1);
+    expect(simulatorService.compareVersions("v1.0.0", "v2.0.0")).toBe(-1);
+    expect(simulatorService.compareVersions("v1.0.0", "v1.1.0")).toBe(-1);
+    expect(simulatorService.compareVersions("v1.0.0", "v1.0.1")).toBe(-1);
+  });
+
+  test("should return 1 when first version is greater than second", () => {
+    expect(simulatorService.compareVersions("v0.66.0", "v0.65.0")).toBe(1);
+    expect(simulatorService.compareVersions("v0.65.1", "v0.65.0")).toBe(1);
+    expect(simulatorService.compareVersions("v2.0.0", "v1.0.0")).toBe(1);
+    expect(simulatorService.compareVersions("v1.1.0", "v1.0.0")).toBe(1);
+    expect(simulatorService.compareVersions("v1.0.1", "v1.0.0")).toBe(1);
+  });
+
+  test("should handle versions with different number of parts", () => {
+    expect(simulatorService.compareVersions("v1.0", "v1.0.0")).toBe(0);
+    expect(simulatorService.compareVersions("v1.0.0", "v1.0")).toBe(0);
+    expect(simulatorService.compareVersions("v1.0", "v1.0.1")).toBe(-1);
+    expect(simulatorService.compareVersions("v1.0.1", "v1.0")).toBe(1);
+  });
+
+  test("should handle versions without 'v' prefix", () => {
+    expect(simulatorService.compareVersions("1.0.0", "1.0.0")).toBe(0);
+    expect(simulatorService.compareVersions("1.0.0", "1.0.1")).toBe(-1);
+    expect(simulatorService.compareVersions("1.0.1", "1.0.0")).toBe(1);
+  });
+
+  test("should handle mixed prefix versions", () => {
+    expect(simulatorService.compareVersions("v1.0.0", "1.0.0")).toBe(0);
+    expect(simulatorService.compareVersions("1.0.0", "v1.0.1")).toBe(-1);
+    expect(simulatorService.compareVersions("v1.0.1", "1.0.0")).toBe(1);
+  });
+
+  test("should handle pre-release versions by comparing base version", () => {
+    expect(simulatorService.compareVersions("v1.0.0-alpha", "v1.0.0")).toBe(0);
+    expect(simulatorService.compareVersions("v1.0.0-beta", "v1.0.0-alpha")).toBe(0);
+    expect(simulatorService.compareVersions("v1.0.0-alpha", "v1.0.1")).toBe(-1);
+    expect(simulatorService.compareVersions("v1.0.1-beta", "v1.0.0")).toBe(1);
+    expect(simulatorService.compareVersions("v1.0.0-test000", "v1.0.0-beta")).toBe(0);
+  });
+
+  test("should handle mixed pre-release and regular versions", () => {
+    expect(simulatorService.compareVersions("1.0.0-alpha", "v1.0.0")).toBe(0);
+    expect(simulatorService.compareVersions("v1.0.0", "1.0.0-beta")).toBe(0);
+    expect(simulatorService.compareVersions("1.0.0-alpha", "v1.0.1")).toBe(-1);
+    expect(simulatorService.compareVersions("v1.0.1-beta", "1.0.0")).toBe(1);
+  });
+});