genlayer 0.0.25 → 0.0.27

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 
 
+## 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.25";
+var version = "0.0.27";
 
 // 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.";
@@ -42505,8 +42505,20 @@ 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 2)",
+    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
@@ -44521,13 +44533,13 @@ function waitForSimulatorToBeReady() {
         yield sleep(STARTING_TIMEOUT_WAIT_CYLCE * 2);
         return waitForSimulatorToBeReady(retries - 1);
       }
-      return { initialized: false, error: "ERROR" };
+      return { initialized: false, errorCode: "ERROR", errorMessage: error.message };
     }
-    return { initialized: false, error: "TIMEOUT" };
+    return { initialized: false, errorCode: "TIMEOUT" };
   });
 }
-function clearDatabaseTables() {
-  return rpcClient.request({ method: "clear_tables", params: [] });
+function clearAccountsAndTransactionsDatabase() {
+  return rpcClient.request({ method: "clear_account_and_transactions_tables", params: [] });
 }
 function initializeDatabase() {
   return __async(this, null, function* () {
@@ -44624,7 +44636,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];
@@ -44659,12 +44673,13 @@ function initAction(options) {
       return;
     }
     try {
-      const { initialized, error } = yield waitForSimulatorToBeReady();
-      if (!initialized && error === "ERROR") {
+      const { initialized, errorCode, errorMessage } = yield waitForSimulatorToBeReady();
+      if (!initialized && errorCode === "ERROR") {
+        console.log(errorMessage);
         console.error("Unable to initialize the GenLayer simulator. Please try again.");
         return;
       }
-      if (!initialized && error === "TIMEOUT") {
+      if (!initialized && errorCode === "TIMEOUT") {
         console.error(
           "The simulator is taking too long to initialize. Please try again after the simulator is ready."
         );
@@ -44681,7 +44696,7 @@ function initAction(options) {
     }
     console.log("Initializing the database...");
     try {
-      yield clearDatabaseTables();
+      yield clearAccountsAndTransactionsDatabase();
       const { createResponse, tablesResponse } = yield initializeDatabase();
       if (!createResponse || !tablesResponse) {
         console.error("Unable to initialize the database. Please try again.");
@@ -44714,8 +44729,10 @@ function initAction(options) {
 // src/commands/general/start.ts
 function startAction(options) {
   return __async(this, null, function* () {
-    const restartHintText = options.restart ? "restarting the database and validators" : "keeping the database and validators previous configuration";
-    console.log(`Starting GenLayer simulator ${restartHintText}`);
+    const { resetAccounts, resetValidators } = options;
+    const restartAccountsHintText = resetAccounts ? "restarting the accounts and transactions database" : "keeping the accounts and transactions records";
+    const restartValidatorsHintText = resetValidators ? "and creating new random validators" : "and keeping the existing validators";
+    console.log(`Starting GenLayer simulator ${restartAccountsHintText} ${restartValidatorsHintText}`);
     console.log(`Updating GenLayer Simulator...`);
     try {
       yield updateSimulator();
@@ -44731,12 +44748,13 @@ function startAction(options) {
       return;
     }
     try {
-      const { initialized, error } = yield waitForSimulatorToBeReady();
-      if (!initialized && error === "ERROR") {
+      const { initialized, errorCode, errorMessage } = yield waitForSimulatorToBeReady();
+      if (!initialized && errorCode === "ERROR") {
+        console.log(errorMessage);
         console.error("Unable to initialize the GenLayer simulator. Please try again.");
         return;
       }
-      if (!initialized && error === "TIMEOUT") {
+      if (!initialized && errorCode === "TIMEOUT") {
         console.error(
           "The simulator is taking too long to initialize. Please try again after the simulator is ready."
         );
@@ -44747,10 +44765,10 @@ function startAction(options) {
       console.error(error);
       return;
     }
-    if (options.restart) {
+    if (resetAccounts) {
       console.log("Initializing the database...");
       try {
-        yield clearDatabaseTables();
+        yield clearAccountsAndTransactionsDatabase();
         const { createResponse, tablesResponse } = yield initializeDatabase();
         if (!createResponse || !tablesResponse) {
           console.error("Unable to initialize the database. Please try again.");
@@ -44760,6 +44778,9 @@ function startAction(options) {
         console.error(error);
         return;
       }
+      console.log("Database successfully reset...");
+    }
+    if (resetValidators) {
       console.log("Initializing validators...");
       try {
         yield deleteAllValidators();
@@ -44769,6 +44790,7 @@ function startAction(options) {
         console.error(error);
         return;
       }
+      console.log("New random validators successfully created...");
     }
     console.log(
       `GenLayer simulator initialized successfully! Go to ${getFrontendUrl()} in your browser to access it.`
@@ -44784,7 +44806,7 @@ function startAction(options) {
 // src/commands/general/index.ts
 function initializeGeneralCommands(program2) {
   program2.command("init").description("Initialize the GenLayer Environment").option("-n, --numValidators <numValidators>", "Number of validators", "5").action(initAction);
-  program2.command("up").description("Starts GenLayer's simulator").option("-nr, --no-restart", "Don't restart the database and validators", true).action(startAction);
+  program2.command("up").description("Starts GenLayer's simulator").option("--no-reset-accounts", "Don't restart the database for accouts and transactions", true).option("--reset-validators", "Remove all current validators and create new random ones", false).action(startAction);
   return program2;
 }
 

package/package.json

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

package/src/commands/general/index.ts

@@ -13,7 +13,8 @@ export function initializeGeneralCommands(program: Command) {
   program
     .command("up")
     .description("Starts GenLayer's simulator")
-    .option("-nr, --no-restart", "Don't restart the database and validators", true)
+    .option("--no-reset-accounts", "Don't restart the database for accouts and transactions", true)
+    .option("--reset-validators", "Remove all current validators and create new random ones", false)
     .action(startAction);
 
   return program;

package/src/commands/general/init.ts

@@ -9,7 +9,7 @@ import {
   runSimulator,
   waitForSimulatorToBeReady,
   updateSimulator,
-  clearDatabaseTables,
+  clearAccountsAndTransactionsDatabase,
   createRandomValidators,
   deleteAllValidators,
   pullOllamaModel,
@@ -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...");
@@ -140,12 +142,13 @@ export async function initAction(options: InitActionOptions) {
   }
 
   try {
-    const {initialized, error} = await waitForSimulatorToBeReady();
-    if (!initialized && error === "ERROR") {
+    const {initialized, errorCode, errorMessage} = await waitForSimulatorToBeReady();
+    if (!initialized && errorCode === "ERROR") {
+      console.log(errorMessage);
       console.error("Unable to initialize the GenLayer simulator. Please try again.");
       return;
     }
-    if (!initialized && error === "TIMEOUT") {
+    if (!initialized && errorCode === "TIMEOUT") {
       console.error(
         "The simulator is taking too long to initialize. Please try again after the simulator is ready.",
       );
@@ -167,7 +170,7 @@ export async function initAction(options: InitActionOptions) {
   console.log("Initializing the database...");
   try {
     //remove everything from the database
-    await clearDatabaseTables();
+    await clearAccountsAndTransactionsDatabase();
 
     const {createResponse, tablesResponse} = await initializeDatabase();
     if (!createResponse || !tablesResponse) {

package/src/commands/general/start.ts

@@ -4,21 +4,29 @@ import {
   waitForSimulatorToBeReady,
   deleteAllValidators,
   createRandomValidators,
-  clearDatabaseTables,
+  clearAccountsAndTransactionsDatabase,
   initializeDatabase,
   getFrontendUrl,
   openFrontend,
 } from "@/lib/services/simulator";
 
 export interface StartActionOptions {
-  restart: string;
+  resetAccounts: string;
+  resetValidators: string;
 }
 
 export async function startAction(options: StartActionOptions) {
-  const restartHintText = options.restart
-    ? "restarting the database and validators"
-    : "keeping the database and validators previous configuration";
-  console.log(`Starting GenLayer simulator ${restartHintText}`);
+  const {resetAccounts, resetValidators} = options;
+
+  const restartAccountsHintText = resetAccounts
+    ? "restarting the accounts and transactions database"
+    : "keeping the accounts and transactions records";
+
+  const restartValidatorsHintText = resetValidators
+    ? "and creating new random validators"
+    : "and keeping the existing validators";
+
+  console.log(`Starting GenLayer simulator ${restartAccountsHintText} ${restartValidatorsHintText}`);
 
   // Update the simulator to the latest version
   console.log(`Updating GenLayer Simulator...`);
@@ -39,12 +47,13 @@ export async function startAction(options: StartActionOptions) {
   }
 
   try {
-    const {initialized, error} = await waitForSimulatorToBeReady();
-    if (!initialized && error === "ERROR") {
+    const {initialized, errorCode, errorMessage} = await waitForSimulatorToBeReady();
+    if (!initialized && errorCode === "ERROR") {
+      console.log(errorMessage);
       console.error("Unable to initialize the GenLayer simulator. Please try again.");
       return;
     }
-    if (!initialized && error === "TIMEOUT") {
+    if (!initialized && errorCode === "TIMEOUT") {
       console.error(
         "The simulator is taking too long to initialize. Please try again after the simulator is ready.",
       );
@@ -56,12 +65,12 @@ export async function startAction(options: StartActionOptions) {
     return;
   }
 
-  if (options.restart) {
+  if (resetAccounts) {
     // Initialize the database
     console.log("Initializing the database...");
     try {
       //remove everything from the database
-      await clearDatabaseTables();
+      await clearAccountsAndTransactionsDatabase();
 
       const {createResponse, tablesResponse} = await initializeDatabase();
       if (!createResponse || !tablesResponse) {
@@ -72,7 +81,10 @@ export async function startAction(options: StartActionOptions) {
       console.error(error);
       return;
     }
+    console.log("Database successfully reset...");
+  }
 
+  if (resetValidators) {
     // Initializing validators
     console.log("Initializing validators...");
     try {
@@ -85,6 +97,7 @@ export async function startAction(options: StartActionOptions) {
       console.error(error);
       return;
     }
+    console.log("New random validators successfully created...");
   }
 
   // Simulator ready

package/src/lib/config/simulator.ts

@@ -15,13 +15,25 @@ 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 2)",
+    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

@@ -141,7 +141,8 @@ export function runSimulator(): Promise<{stdout: string; stderr: string}> {
 
 type WaitForSimulatorToBeReadyResultType = {
   initialized: boolean;
-  error?: "TIMEOUT" | "ERROR";
+  errorCode?: "TIMEOUT" | "ERROR";
+  errorMessage?: string;
 };
 
 export async function waitForSimulatorToBeReady(
@@ -162,14 +163,14 @@ export async function waitForSimulatorToBeReady(
       await sleep(STARTING_TIMEOUT_WAIT_CYLCE * 2);
       return waitForSimulatorToBeReady(retries - 1);
     }
-    return {initialized: false, error: "ERROR"};
+    return {initialized: false, errorCode: "ERROR", errorMessage: error.message};
   }
 
-  return {initialized: false, error: "TIMEOUT"};
+  return {initialized: false, errorCode: "TIMEOUT"};
 }
 
-export function clearDatabaseTables(): Promise<any> {
-  return rpcClient.request({method: "clear_tables", params: []});
+export function clearAccountsAndTransactionsDatabase(): Promise<any> {
+  return rpcClient.request({method: "clear_account_and_transactions_tables", params: []});
 }
 
 type InitializeDatabaseResultType = {