genlayer 0.0.26 → 0.0.28

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 
 
+## 0.0.28 (2024-05-13)
+
+## 0.0.27 (2024-05-08)
+
 ## 0.0.26 (2024-05-07)
 
 ## 0.0.25 (2024-05-06)

package/dist/index.js

@@ -39896,7 +39896,7 @@ var {
 } = import_index.default;
 
 // package.json
-var version = "0.0.26";
+var version = "0.0.28";
 
 // 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.";
@@ -42497,16 +42497,28 @@ var DEFAULT_RUN_SIMULATOR_COMMAND = (simulatorLocation) => ({
   linux: `x-terminal-emulator -e bash -c 'cd ${simulatorLocation} && docker compose build && docker compose up; 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'`
+  darwin: `cd ${simulatorLocation} && docker exec ollama ollama pull llama3`,
+  win32: `cd /d ${simulatorLocation} && docker exec ollama ollama pull llama3`,
+  linux: `cd ${simulatorLocation} && docker exec ollama ollama pull llama3`
 });
 var AVAILABLE_PLATFORMS = ["darwin", "win32", "linux"];
 var STARTING_TIMEOUT_WAIT_CYLCE = 2e3;
 var STARTING_TIMEOUT_ATTEMPTS = 120;
 var AI_PROVIDERS_CONFIG = {
-  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: "OPENAIKEY", cliOptionValue: "openai" }
+  ollama: {
+    name: "Ollama (This will download and run a local instance of Llama 3)",
+    cliOptionValue: "ollama"
+  },
+  openai: {
+    name: "OpenAI (You will need to provide an OpenAI API key)",
+    envVar: "OPENAIKEY",
+    cliOptionValue: "openai"
+  },
+  heurist: {
+    name: 'Heurist (You will need to provide an API key. Get free API credits at https://dev-api-form.heurist.ai/ with referral code: "genlayer"):',
+    envVar: "HEURISTAIAPIKEY",
+    cliOptionValue: "heurist"
+  }
 };
 
 // src/lib/services/simulator.ts
@@ -44369,7 +44381,6 @@ function checkCommand(command, toolName) {
     if (stderr) {
       throw new MissingRequirementError(toolName);
     }
-    console.log(`${toolName} is installed.`);
   });
 }
 function executeCommand(cmdsByPlatform, toolName) {
@@ -44517,7 +44528,7 @@ function waitForSimulatorToBeReady() {
         return waitForSimulatorToBeReady(retries - 1);
       }
     } catch (error) {
-      if ((error.message.includes("ECONNREFUSED") || error.message.includes("socket hang up")) && retries > 0) {
+      if ((error.message.includes("ECONNRESET") || error.message.includes("ECONNREFUSED") || error.message.includes("socket hang up")) && retries > 0) {
         yield sleep(STARTING_TIMEOUT_WAIT_CYLCE * 2);
         return waitForSimulatorToBeReady(retries - 1);
       }
@@ -44536,8 +44547,8 @@ function initializeDatabase() {
     return { createResponse, tablesResponse };
   });
 }
-function createRandomValidators() {
-  return rpcClient.request({ method: "create_random_validators", params: [10, 1, 10] });
+function createRandomValidators(numValidators) {
+  return rpcClient.request({ method: "create_random_validators", params: [numValidators, 1, 10] });
 }
 function deleteAllValidators() {
   return rpcClient.request({ method: "delete_all_validators", params: [] });
@@ -44624,7 +44635,9 @@ function initAction(options) {
     const llmProvidersAnswer = yield inquirer_default.prompt(questions);
     const selectedLlmProviders = llmProvidersAnswer.selectedLlmProviders;
     const aiProvidersEnvVars = {};
-    const configurableAiProviders = selectedLlmProviders.filter((provider) => provider !== "ollama");
+    const configurableAiProviders = selectedLlmProviders.filter(
+      (provider) => AI_PROVIDERS_CONFIG[provider].envVar
+    );
     for (let i2 = 0; i2 < configurableAiProviders.length; i2++) {
       const provider = configurableAiProviders[i2];
       const providerConfig = AI_PROVIDERS_CONFIG[provider];
@@ -44677,7 +44690,7 @@ function initAction(options) {
       return;
     }
     if (selectedLlmProviders.includes("ollama")) {
-      console.log("Pulling llama2 from Ollama...");
+      console.log("Pulling llama3 from Ollama...");
       yield pullOllamaModel();
     }
     console.log("Initializing the database...");
@@ -44695,7 +44708,7 @@ function initAction(options) {
     console.log("Initializing validators...");
     try {
       yield deleteAllValidators();
-      yield createRandomValidators();
+      yield createRandomValidators(Number(options.numValidators));
     } catch (error) {
       console.error("Unable to initialize the validators.");
       console.error(error);

package/package.json

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

package/src/commands/general/init.ts

@@ -100,7 +100,9 @@ export async function initAction(options: InitActionOptions) {
 
   // Gather the API Keys
   const aiProvidersEnvVars: Record<string, string> = {};
-  const configurableAiProviders = selectedLlmProviders.filter((provider: string) => provider !== "ollama");
+  const configurableAiProviders = selectedLlmProviders.filter(
+    (provider: AiProviders) => AI_PROVIDERS_CONFIG[provider].envVar,
+  );
   for (let i = 0; i < configurableAiProviders.length; i++) {
     const provider = configurableAiProviders[i];
     const providerConfig = AI_PROVIDERS_CONFIG[provider];
@@ -119,7 +121,7 @@ export async function initAction(options: InitActionOptions) {
     ];
 
     const apiKeyAnswer = await inquirer.prompt(questions);
-    aiProvidersEnvVars[providerConfig.envVar] = apiKeyAnswer[providerConfig.cliOptionValue];
+    aiProvidersEnvVars[providerConfig.envVar!] = apiKeyAnswer[providerConfig.cliOptionValue];
   }
 
   console.log("Configuring GenLayer Simulator environment...");
@@ -160,7 +162,7 @@ export async function initAction(options: InitActionOptions) {
 
   // Ollama doesn't need changes in configuration, we just run it
   if (selectedLlmProviders.includes("ollama")) {
-    console.log("Pulling llama2 from Ollama...");
+    console.log("Pulling llama3 from Ollama...");
     await pullOllamaModel();
   }
 
@@ -186,7 +188,7 @@ export async function initAction(options: InitActionOptions) {
     //remove all validators
     await deleteAllValidators();
     // create random validators
-    await createRandomValidators();
+    await createRandomValidators(Number(options.numValidators));
   } catch (error) {
     console.error("Unable to initialize the validators.");
     console.error(error);

package/src/lib/clients/system.ts

@@ -13,7 +13,6 @@ export async function checkCommand(command: string, toolName: string): Promise<v
   if (stderr) {
     throw new MissingRequirementError(toolName);
   }
-  console.log(`${toolName} is installed.`);
 }
 
 type ExecuteCommandResult = {

package/src/lib/config/simulator.ts

@@ -6,22 +6,34 @@ export const DEFAULT_RUN_SIMULATOR_COMMAND = (simulatorLocation: string) => ({
   linux: `x-terminal-emulator -e bash -c 'cd ${simulatorLocation} && docker compose build && docker compose up; 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'`,
+  darwin: `cd ${simulatorLocation} && docker exec ollama ollama pull llama3`,
+  win32: `cd /d ${simulatorLocation} && docker exec ollama ollama pull llama3`,
+  linux: `cd ${simulatorLocation} && docker exec ollama ollama pull llama3`,
 });
 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 = 120;
 
-export type AiProviders = "ollama" | "openai";
-export type AiProvidersEnvVars = "ollama" | "OPENAIKEY";
+export type AiProviders = "ollama" | "openai" | "heurist";
+export type AiProvidersEnvVars = "ollama" | "OPENAIKEY" | "HEURISTAIAPIKEY";
 export type AiProvidersConfigType = {
-  [key in AiProviders]: {name: string; envVar: AiProvidersEnvVars; cliOptionValue: string};
+  [key in AiProviders]: {name: string; envVar?: AiProvidersEnvVars; cliOptionValue: string};
 };
 
 export const AI_PROVIDERS_CONFIG: AiProvidersConfigType = {
-  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: "OPENAIKEY", cliOptionValue: "openai"},
+  ollama: {
+    name: "Ollama (This will download and run a local instance of Llama 3)",
+    cliOptionValue: "ollama",
+  },
+  openai: {
+    name: "OpenAI (You will need to provide an OpenAI API key)",
+    envVar: "OPENAIKEY",
+    cliOptionValue: "openai",
+  },
+  heurist: {
+    name: 'Heurist (You will need to provide an API key. Get free API credits at https://dev-api-form.heurist.ai/ with referral code: "genlayer"):',
+    envVar: "HEURISTAIAPIKEY",
+    cliOptionValue: "heurist",
+  },
 };

package/src/lib/services/simulator.ts

@@ -159,7 +159,12 @@ export async function waitForSimulatorToBeReady(
       return waitForSimulatorToBeReady(retries - 1);
     }
   } catch (error: any) {
-    if ((error.message.includes("ECONNREFUSED") || error.message.includes("socket hang up")) && retries > 0) {
+    if (
+      (error.message.includes("ECONNRESET") ||
+        error.message.includes("ECONNREFUSED") ||
+        error.message.includes("socket hang up")) &&
+      retries > 0
+    ) {
       await sleep(STARTING_TIMEOUT_WAIT_CYLCE * 2);
       return waitForSimulatorToBeReady(retries - 1);
     }
@@ -184,8 +189,8 @@ export async function initializeDatabase(): Promise<InitializeDatabaseResultType
   return {createResponse, tablesResponse};
 }
 
-export function createRandomValidators(): Promise<any> {
-  return rpcClient.request({method: "create_random_validators", params: [10, 1, 10]});
+export function createRandomValidators(numValidators: number): Promise<any> {
+  return rpcClient.request({method: "create_random_validators", params: [numValidators, 1, 10]});
 }
 
 export function deleteAllValidators(): Promise<any> {