genlayer 0.34.0 → 0.34.3

package/src/commands/localnet/validators.ts

@@ -1,269 +0,0 @@
-import inquirer from "inquirer";
-import { rpcClient } from "../../lib/clients/jsonRpcClient";
-import { BaseAction } from "../../lib/actions/BaseAction";
-
-export interface ValidatorOptions {
-  address?: string;
-}
-
-export interface UpdateValidatorOptions {
-  address: string;
-  stake?: string;
-  provider?: string;
-  model?: string;
-  config?: string;
-}
-
-export interface CreateRandomValidatorsOptions {
-  count: string;
-  providers: string[];
-  models: string[];
-}
-
-export interface CreateValidatorOptions {
-  stake: string;
-  config?: string;
-  model?: string;
-  provider?: string;
-}
-
-export class ValidatorsAction extends BaseAction {
-  public async getValidator(options: ValidatorOptions): Promise<void> {
-    try {
-      if (options.address) {
-        this.startSpinner(`Fetching validator with address: ${options.address}`);
-
-        const result = await rpcClient.request({
-          method: "sim_getValidator",
-          params: [options.address],
-        });
-
-        this.succeedSpinner(`Successfully fetched validator with address: ${options.address}`, result.result);
-      } else {
-        this.startSpinner(`Fetching all validators...`);
-
-        const result = await rpcClient.request({
-          method: "sim_getAllValidators",
-          params: [],
-        });
-        this.succeedSpinner('Successfully fetched all validators.', result.result)
-      }
-    } catch (error) {
-      this.failSpinner("Error fetching validators", error);
-    }
-  }
-
-  public async deleteValidator(options: ValidatorOptions): Promise<void> {
-    try {
-      if (options.address) {
-        await this.confirmPrompt(`This command will delete the validator with the address: ${options.address}. Do you want to continue?`);
-        this.startSpinner(`Deleting validator with address: ${options.address}`);
-
-        const result = await rpcClient.request({
-          method: "sim_deleteValidator",
-          params: [options.address],
-        });
-
-        this.succeedSpinner(`Deleted Address: ${result.result}`);
-      } else {
-        await this.confirmPrompt(`This command will delete all validators. Do you want to continue?`);
-        this.startSpinner("Deleting all validators...");
-
-        await rpcClient.request({
-          method: "sim_deleteAllValidators",
-          params: [],
-        });
-
-        this.succeedSpinner("Successfully deleted all validators");
-      }
-    } catch (error) {
-      this.failSpinner("Error deleting validators", error);
-    }
-  }
-
-  public async countValidators(): Promise<void> {
-    try {
-      this.startSpinner("Counting all validators...");
-
-      const result = await rpcClient.request({
-        method: "sim_countValidators",
-        params: [],
-      });
-      this.succeedSpinner(`Total Validators: ${result.result}`);
-    } catch (error) {
-      this.failSpinner("Error counting validators", error);
-    }
-  }
-
-  public async updateValidator(options: UpdateValidatorOptions): Promise<void> {
-    try {
-      this.startSpinner(`Fetching validator with address: ${options.address}...`);
-      const currentValidator = await rpcClient.request({
-        method: "sim_getValidator",
-        params: [options.address],
-      });
-
-      this.log("Current Validator Details:", currentValidator.result);
-
-      const parsedStake = options.stake
-        ? parseInt(options.stake, 10)
-        : currentValidator.result.stake;
-
-      if (isNaN(parsedStake) || parsedStake < 0) {
-        return this.failSpinner("Invalid stake value. Stake must be a positive integer.");
-      }
-
-      const updatedValidator = {
-        address: options.address,
-        stake: options.stake || currentValidator.result.stake,
-        provider: options.provider || currentValidator.result.provider,
-        model: options.model || currentValidator.result.model,
-        config: options.config ? JSON.parse(options.config) : currentValidator.result.config,
-      };
-
-      this.log("Updated Validator Details:", updatedValidator);
-
-      this.setSpinnerText('Updating Validator...');
-
-      const result = await rpcClient.request({
-        method: "sim_updateValidator",
-        params: [
-          updatedValidator.address,
-          updatedValidator.stake,
-          updatedValidator.provider,
-          updatedValidator.model,
-          updatedValidator.config,
-        ],
-      });
-
-      this.succeedSpinner("Validator successfully updated", result.result);
-    } catch (error) {
-      this.failSpinner("Error updating validator", error);
-    }
-  }
-
-  public async createRandomValidators(options: CreateRandomValidatorsOptions): Promise<void> {
-    try {
-      const count = parseInt(options.count, 10);
-      if (isNaN(count) || count < 1) {
-        return this.logError("Invalid count. Please provide a positive integer.");
-      }
-
-      this.startSpinner(`Creating ${count} random validator(s)...`);
-      this.log(`Providers: ${options.providers.length > 0 ? options.providers.join(", ") : "All"}`);
-      this.log(`Models: ${options.models.length > 0 ? options.models.join(", ") : "All"}`);
-
-      const result = await rpcClient.request({
-        method: "sim_createRandomValidators",
-        params: [count, 1, 10, options.providers, options.models],
-      });
-
-      this.succeedSpinner("Random validators successfully created", result.result);
-    } catch (error) {
-      this.failSpinner("Error creating random validators", error);
-    }
-  }
-
-  public async createValidator(options: CreateValidatorOptions): Promise<void> {
-    try {
-      const stake = parseInt(options.stake, 10);
-      if (isNaN(stake) || stake < 1) {
-        return this.logError("Invalid stake. Please provide a positive integer.");
-      }
-
-      if (options.model && !options.provider) {
-        return this.logError("You must specify a provider if using a model.");
-      }
-
-      this.startSpinner("Fetching available providers and models...");
-
-      const providersAndModels = await rpcClient.request({
-        method: "sim_getProvidersAndModels",
-        params: [],
-      });
-      this.stopSpinner();
-
-      if (!providersAndModels.result || providersAndModels.result.length === 0) {
-        return this.logError("No providers or models available.");
-      }
-
-      const availableProviders = [
-        ...new Map(
-          providersAndModels.result
-            .filter((entry: any) => entry.is_available)
-            .map((entry: any) => [entry.provider, entry])
-        ).values(),
-      ];
-
-      let provider =  options.provider
-
-      if(!provider){
-        const { selectedProvider } = await inquirer.prompt([
-          {
-            type: "list",
-            name: "selectedProvider",
-            message: "Select a provider:",
-            choices: availableProviders.map((entry: any) => entry.provider),
-          },
-        ]);
-
-        provider = selectedProvider;
-      }
-
-      const availableModels = providersAndModels.result.filter(
-        (entry: any) => entry.provider === provider && entry.is_model_available
-      );
-
-      if (availableModels.length === 0) {
-        return this.logError("No models available for the selected provider.");
-      }
-
-      let model = options.model;
-
-      if(!model){
-        const { selectedModel } = await inquirer.prompt([
-          {
-            type: "list",
-            name: "selectedModel",
-            message: "Select a model:",
-            choices: availableModels.map((entry: any) => entry.model),
-          },
-        ]);
-
-        model = selectedModel;
-      }
-
-      const modelDetails = availableModels.find(
-        (entry: any) => entry.model === model
-      );
-
-      if (!modelDetails) {
-        return this.logError("Selected model details not found.");
-      }
-
-      const config = options.config ? JSON.parse(options.config) : modelDetails.config;
-      const params = [
-        stake,
-        modelDetails.provider,
-        modelDetails.model,
-        config,
-        modelDetails.plugin,
-        modelDetails.plugin_config,
-      ]
-
-      this.log("Validator details:", params);
-      this.startSpinner('Creating validator...');
-
-      const result = await rpcClient.request({
-        method: "sim_createValidator",
-        params,
-      });
-
-      this.succeedSpinner("Validator successfully created:", result.result);
-    } catch (error) {
-      this.failSpinner("Error creating validator", error);
-    }
-  }
-}
-
-

package/src/commands/network/index.ts

@@ -1,29 +0,0 @@
-import {Command} from "commander";
-import {NetworkActions} from "./setNetwork";
-
-export function initializeNetworkCommands(program: Command) {
-  const networkActions = new NetworkActions();
-
-  const network = program.command("network").description("Network configuration");
-
-  // genlayer network set [name]
-  network
-    .command("set")
-    .description("Set the network to use")
-    .argument("[network]", "The network to set")
-    .action((networkName?: string) => networkActions.setNetwork(networkName));
-
-  // genlayer network info
-  network
-    .command("info")
-    .description("Show current network configuration and contract addresses")
-    .action(() => networkActions.showInfo());
-
-  // genlayer network list
-  network
-    .command("list")
-    .description("List available networks")
-    .action(() => networkActions.listNetworks());
-
-  return program;
-}

package/src/commands/network/setNetwork.ts

@@ -1,77 +0,0 @@
-import {BaseAction, BUILT_IN_NETWORKS, resolveNetwork} from "../../lib/actions/BaseAction";
-import inquirer, {DistinctQuestion} from "inquirer";
-
-const networks = Object.entries(BUILT_IN_NETWORKS).map(([alias, network]) => ({
-  name: network.name,
-  alias,
-  value: network,
-}));
-
-export class NetworkActions extends BaseAction {
-  constructor() {
-    super();
-  }
-
-  async showInfo(): Promise<void> {
-    const storedNetwork = this.getConfigByKey("network") || "localnet";
-    const network = resolveNetwork(storedNetwork);
-
-    const info: Record<string, string> = {
-      alias: storedNetwork,
-      name: network.name,
-      chainId: network.id?.toString() || "unknown",
-      rpc: network.rpcUrls?.default?.http?.[0] || "unknown",
-      mainContract: network.consensusMainContract?.address || "not set",
-      stakingContract: network.stakingContract?.address || "not set",
-    };
-
-    if (network.blockExplorers?.default?.url) {
-      info.explorer = network.blockExplorers.default.url;
-    }
-
-    this.succeedSpinner("Current network", info);
-  }
-
-  async listNetworks(): Promise<void> {
-    const currentNetwork = this.getConfigByKey("network") || "localnet";
-
-    console.log("");
-    for (const net of networks) {
-      const marker = net.alias === currentNetwork ? "*" : " ";
-      console.log(`${marker} ${net.alias.padEnd(16)} ${net.name}`);
-    }
-    console.log("");
-  }
-
-  async setNetwork(networkName?: string): Promise<void> {
-    if (networkName || networkName === "") {
-      if (!networks.some(n => n.name === networkName || n.alias === networkName)) {
-        this.failSpinner(`Network ${networkName} not found`);
-        return;
-      }
-      const selectedNetwork = networks.find(n => n.name === networkName || n.alias === networkName);
-      if (!selectedNetwork) {
-        this.failSpinner(`Network ${networkName} not found`);
-        return;
-      }
-      this.writeConfig("network", selectedNetwork.alias);
-      this.succeedSpinner(`Network successfully set to ${selectedNetwork.name}`);
-      return;
-    }
-
-    const networkQuestions: DistinctQuestion[] = [
-      {
-        type: "list",
-        name: "selectedNetwork",
-        message: "Select which network do you want to use:",
-        choices: networks.map(n => ({name: n.name, value: n.alias})),
-      },
-    ];
-    const networkAnswer = await inquirer.prompt(networkQuestions);
-    const selectedAlias = networkAnswer.selectedNetwork;
-    const selectedNetwork = networks.find(n => n.alias === selectedAlias)!;
-
-    this.writeConfig("network", selectedAlias);
-    this.succeedSpinner(`Network successfully set to ${selectedNetwork.name}`);
-  }
-}

package/src/commands/scaffold/index.ts

@@ -1,16 +0,0 @@
-import { Command } from "commander";
-import { NewAction } from "./new";
-
-export function initializeScaffoldCommands(program: Command) {
-  program
-    .command("new <projectName>")
-    .description("Create a new GenLayer project using the default template")
-    .option("--path <directory>", "Specify the directory for the new project", ".")
-    .option("--overwrite", "Overwrite existing directory if it exists", false)
-    .action(async (projectName, options) => {
-      const newProjectAction = new NewAction();
-      await newProjectAction.createProject(projectName, options);
-    });
-
-  return program;
-}

package/src/commands/scaffold/new.ts

@@ -1,34 +0,0 @@
-import fs from "fs-extra";
-import path from "path";
-import { fileURLToPath } from "url";
-import { BaseAction } from "../../lib/actions/BaseAction";
-
-export class NewAction extends BaseAction {
-  private templatePath: string;
-
-  constructor() {
-    super();
-    const __filename = fileURLToPath(import.meta.url);
-    const basePath = path.resolve(path.dirname(__filename), "..");
-    this.templatePath = path.join(basePath, "templates", "default");
-  }
-
-  async createProject(projectName: string, options: { path: string; overwrite: boolean }) {
-    const targetPath = path.resolve(options.path, projectName);
-
-    if (fs.existsSync(targetPath) && !options.overwrite) {
-      return this.failSpinner(
-        `Project directory "${targetPath}" already exists. Use --overwrite to replace it.`
-      );
-    }
-
-    this.startSpinner(`Creating new GenLayer project: ${projectName}`);
-
-    try {
-      fs.copySync(this.templatePath, targetPath);
-      this.succeedSpinner(`Project "${projectName}" created successfully at ${targetPath}`);
-    } catch (error) {
-      this.failSpinner(`Error creating project "${projectName}"`, error);
-    }
-  }
-}

package/src/commands/staking/StakingAction.ts

@@ -1,279 +0,0 @@
-import {BaseAction, BUILT_IN_NETWORKS, resolveNetwork} from "../../lib/actions/BaseAction";
-import {createClient, createAccount, formatStakingAmount, parseStakingAmount, abi} from "genlayer-js";
-import type {GenLayerClient, GenLayerChain, Address} from "genlayer-js/types";
-import {readFileSync, existsSync} from "fs";
-import {ethers, ZeroAddress} from "ethers";
-import {createPublicClient, createWalletClient, http, type PublicClient, type WalletClient, type Chain, type Account} from "viem";
-import {privateKeyToAccount} from "viem/accounts";
-
-// Extended ABI for tree traversal (not in SDK)
-const STAKING_TREE_ABI = [
-  {
-    name: "validatorsRoot",
-    type: "function",
-    stateMutability: "view",
-    inputs: [],
-    outputs: [{name: "", type: "address"}],
-  },
-] as const;
-
-// Re-export for use by other staking commands
-export {BUILT_IN_NETWORKS};
-
-export interface StakingConfig {
-  rpc?: string;
-  stakingAddress?: string;
-  network?: string;
-  account?: string;
-  password?: string;
-}
-
-export class StakingAction extends BaseAction {
-  private _stakingClient: GenLayerClient<GenLayerChain> | null = null;
-  private _passwordOverride: string | undefined;
-
-  constructor() {
-    super();
-  }
-
-  private getNetwork(config: StakingConfig): GenLayerChain {
-    // Priority: --network option > global config > localnet default
-    if (config.network) {
-      const network = BUILT_IN_NETWORKS[config.network];
-      if (!network) {
-        throw new Error(`Unknown network: ${config.network}. Available: ${Object.keys(BUILT_IN_NETWORKS).join(", ")}`);
-      }
-      return {...network};
-    }
-
-    return resolveNetwork(this.getConfig().network);
-  }
-
-  protected async getStakingClient(config: StakingConfig): Promise<GenLayerClient<GenLayerChain>> {
-    if (!this._stakingClient) {
-      // Set account override if provided
-      if (config.account) {
-        this.accountOverride = config.account;
-      }
-      if (config.password) {
-        this._passwordOverride = config.password;
-      }
-
-      const network = this.getNetwork(config);
-
-      // Override staking address if provided
-      if (config.stakingAddress) {
-        network.stakingContract = {
-          address: config.stakingAddress,
-          abi: abi.STAKING_ABI,
-        };
-      }
-
-      const privateKey = await this.getPrivateKeyForStaking();
-      const account = createAccount(privateKey as `0x${string}`);
-
-      this._stakingClient = createClient({
-        chain: network,
-        endpoint: config.rpc,
-        account,
-      });
-    }
-    return this._stakingClient;
-  }
-
-  protected async getReadOnlyStakingClient(config: StakingConfig): Promise<GenLayerClient<GenLayerChain>> {
-    // Set account override if provided
-    if (config.account) {
-      this.accountOverride = config.account;
-    }
-
-    const network = this.getNetwork(config);
-
-    if (config.stakingAddress) {
-      network.stakingContract = {
-        address: config.stakingAddress,
-        abi: abi.STAKING_ABI,
-      };
-    }
-
-    const accountName = this.resolveAccountName();
-    const keystorePath = this.getKeystorePath(accountName);
-
-    if (!existsSync(keystorePath)) {
-      throw new Error(`Account '${accountName}' not found. Run 'genlayer account create --name ${accountName}' first.`);
-    }
-
-    const keystoreData = JSON.parse(readFileSync(keystorePath, "utf-8"));
-    const addr = keystoreData.address as string;
-    const normalizedAddress = (addr.startsWith("0x") ? addr : `0x${addr}`) as Address;
-
-    return createClient({
-      chain: network,
-      endpoint: config.rpc,
-      account: normalizedAddress,
-    });
-  }
-
-  private async getPrivateKeyForStaking(): Promise<string> {
-    const accountName = this.resolveAccountName();
-    const keystorePath = this.getKeystorePath(accountName);
-
-    if (!existsSync(keystorePath)) {
-      throw new Error(`Account '${accountName}' not found. Run 'genlayer account create --name ${accountName}' first.`);
-    }
-
-    const keystoreJson = readFileSync(keystorePath, "utf-8");
-    const keystoreData = JSON.parse(keystoreJson);
-
-    if (!this.isValidKeystoreFormat(keystoreData)) {
-      throw new Error("Invalid keystore format.");
-    }
-
-    const cachedKey = await this.keychainManager.getPrivateKey(accountName);
-    if (cachedKey) {
-      // Verify cached key matches keystore address - safety check
-      const tempAccount = createAccount(cachedKey as `0x${string}`);
-      const cachedAddress = tempAccount.address.toLowerCase();
-      const keystoreAddress = `0x${keystoreData.address.toLowerCase().replace(/^0x/, '')}`;
-
-      if (cachedAddress !== keystoreAddress) {
-        // Cached key doesn't match keystore - invalidate it
-        await this.keychainManager.removePrivateKey(accountName);
-        // Fall through to prompt for password
-      } else {
-        return cachedKey;
-      }
-    }
-
-    let password: string;
-    if (this._passwordOverride) {
-      password = this._passwordOverride;
-    } else {
-      this.stopSpinner();
-      password = await this.promptPassword(`Enter password to unlock account '${accountName}':`);
-    }
-    this.startSpinner("Unlocking account...");
-
-    const wallet = await ethers.Wallet.fromEncryptedJson(keystoreJson, password);
-    return wallet.privateKey;
-  }
-
-  protected parseAmount(amount: string): bigint {
-    return parseStakingAmount(amount);
-  }
-
-  protected formatAmount(amount: bigint): string {
-    return formatStakingAmount(amount);
-  }
-
-  protected async getSignerAddress(): Promise<Address> {
-    const accountName = this.resolveAccountName();
-    const keystorePath = this.getKeystorePath(accountName);
-    if (!existsSync(keystorePath)) {
-      throw new Error(`Account '${accountName}' not found.`);
-    }
-    const keystoreData = JSON.parse(readFileSync(keystorePath, "utf-8"));
-    const addr = keystoreData.address as string;
-    return (addr.startsWith("0x") ? addr : `0x${addr}`) as Address;
-  }
-
-  /**
-   * Get viem clients for direct contract interactions (e.g., ValidatorWallet calls)
-   * Future: can be extended to support hardware wallets
-   */
-  protected async getViemClients(config: StakingConfig): Promise<{
-    walletClient: WalletClient<any, Chain, Account>;
-    publicClient: PublicClient;
-    signerAddress: Address;
-  }> {
-    if (config.account) {
-      this.accountOverride = config.account;
-    }
-    if (config.password) {
-      this._passwordOverride = config.password;
-    }
-
-    const network = this.getNetwork(config);
-    const rpcUrl = config.rpc || network.rpcUrls.default.http[0];
-
-    const privateKey = await this.getPrivateKeyForStaking();
-    const account = privateKeyToAccount(privateKey as `0x${string}`);
-
-    const publicClient = createPublicClient({
-      chain: network,
-      transport: http(rpcUrl),
-    });
-
-    const walletClient = createWalletClient({
-      chain: network,
-      transport: http(rpcUrl),
-      account,
-    });
-
-    return {
-      walletClient,
-      publicClient,
-      signerAddress: account.address as Address,
-    };
-  }
-
-  /**
-   * Get all validators by traversing the validator tree.
-   * This finds ALL validators including those not yet active/primed.
-   */
-  protected async getAllValidatorsFromTree(config: StakingConfig): Promise<Address[]> {
-    const network = this.getNetwork(config);
-    const rpcUrl = config.rpc || network.rpcUrls.default.http[0];
-    const stakingAddress = config.stakingAddress || network.stakingContract?.address;
-
-    if (!stakingAddress) {
-      throw new Error("Staking contract address not configured");
-    }
-
-    const publicClient = createPublicClient({
-      chain: network,
-      transport: http(rpcUrl),
-    });
-
-    // Get the root of the validator tree
-    const root = await publicClient.readContract({
-      address: stakingAddress as `0x${string}`,
-      abi: STAKING_TREE_ABI,
-      functionName: "validatorsRoot",
-    });
-
-    if (root === ZeroAddress) {
-      return [];
-    }
-
-    const validators: Address[] = [];
-    const stack: string[] = [root as string];
-    const visited = new Set<string>();
-
-    // Use validatorView from SDK's ABI (has left/right fields)
-    while (stack.length > 0) {
-      const addr = stack.pop()!;
-
-      if (addr === ZeroAddress || visited.has(addr.toLowerCase())) continue;
-      visited.add(addr.toLowerCase());
-
-      validators.push(addr as Address);
-
-      const info = await publicClient.readContract({
-        address: stakingAddress as `0x${string}`,
-        abi: abi.STAKING_ABI,
-        functionName: "validatorView",
-        args: [addr as `0x${string}`],
-      }) as {left: string; right: string};
-
-      if (info.left !== ZeroAddress) {
-        stack.push(info.left);
-      }
-      if (info.right !== ZeroAddress) {
-        stack.push(info.right);
-      }
-    }
-
-    return validators;
-  }
-}