@0xobelisk/sui-cli 1.1.4 → 1.1.6

package/src/utils/errors.ts

@@ -3,44 +3,44 @@ import { ZodError } from 'zod';
 import { fromZodError, ValidationError } from 'zod-validation-error';
 
 export class NotInsideProjectError extends Error {
-	name = 'NotInsideProjectError';
-	message = 'You are not inside a Dubhe project';
+  name = 'NotInsideProjectError';
+  message = 'You are not inside a Dubhe project';
 }
 
 export class DubheCliError extends Error {
-	name = 'DubheCliError';
+  name = 'DubheCliError';
 }
 
 export class UpgradeError extends Error {
-	name = 'UpgradeError';
+  name = 'UpgradeError';
 }
 
 export class FsIibError extends Error {
-	name = 'FsIibError';
+  name = 'FsIibError';
 }
 
 export function logError(error: unknown) {
-	if (error instanceof ValidationError) {
-		console.log(chalk.redBright(error.message));
-	} else if (error instanceof ZodError) {
-		// TODO currently this error shouldn't happen, use `fromZodErrorCustom`
-		const validationError = fromZodError(error, {
-			prefixSeparator: '\n- ',
-			issueSeparator: '\n- ',
-		});
-		console.log(chalk.redBright(validationError.message));
-	} else if (error instanceof NotInsideProjectError) {
-		console.log(chalk.red(error.message));
-		console.log('');
-		// TODO add docs to the website and update the link to the specific page
-		console.log(
-			chalk.blue(
-				`To learn more about Dubhe's configuration, please go to https://github.com/0xobelisk`
-			)
-		);
-	} else if (error instanceof DubheCliError) {
-		console.log(chalk.red(error));
-	} else {
-		console.log(error);
-	}
+  if (error instanceof ValidationError) {
+    console.log(chalk.redBright(error.message));
+  } else if (error instanceof ZodError) {
+    // TODO currently this error shouldn't happen, use `fromZodErrorCustom`
+    const validationError = fromZodError(error, {
+      prefixSeparator: '\n- ',
+      issueSeparator: '\n- '
+    });
+    console.log(chalk.redBright(validationError.message));
+  } else if (error instanceof NotInsideProjectError) {
+    console.log(chalk.red(error.message));
+    console.log('');
+    // TODO add docs to the website and update the link to the specific page
+    console.log(
+      chalk.blue(
+        `To learn more about Dubhe's configuration, please go to https://github.com/0xobelisk`
+      )
+    );
+  } else if (error instanceof DubheCliError) {
+    console.log(chalk.red(error));
+  } else {
+    console.log(error);
+  }
 }

package/src/utils/generateAccount.ts

@@ -2,111 +2,96 @@ import { Dubhe } from '@0xobelisk/sui-client';
 import * as fs from 'fs';
 import chalk from 'chalk';
 
-export async function generateAccountHandler(
-	force: boolean = false,
-	outputTsPath?: string
-) {
-	if (outputTsPath) {
-		console.log(
-			chalk.blue(
-				'Note: The generated account will be stored in the .env file and the TypeScript file specified by the --output-ts-path option.'
-			)
-		);
-		console.log(
-			chalk.yellow(
-				'Warning: Do not expose the key file. It is intended for local testing only.\n'
-			)
-		);
-	}
-	const path = process.cwd();
-	let privateKey: string;
+export async function generateAccountHandler(force: boolean = false, outputTsPath?: string) {
+  if (outputTsPath) {
+    console.log(
+      chalk.blue(
+        'Note: The generated account will be stored in the .env file and the TypeScript file specified by the --output-ts-path option.'
+      )
+    );
+    console.log(
+      chalk.yellow('Warning: Do not expose the key file. It is intended for local testing only.\n')
+    );
+  }
+  const path = process.cwd();
+  let privateKey: string;
 
-	if (force) {
-		const dubhe = new Dubhe();
-		const keypair = dubhe.getSigner();
-		privateKey = keypair.getSecretKey();
+  if (force) {
+    const dubhe = new Dubhe();
+    const keypair = dubhe.getSigner();
+    privateKey = keypair.getSecretKey();
 
-		fs.writeFileSync(`${path}/.env`, `PRIVATE_KEY=${privateKey}`);
-		console.log(chalk.green(`File created at: ${path}/.env`));
+    fs.writeFileSync(`${path}/.env`, `PRIVATE_KEY=${privateKey}`);
+    console.log(chalk.green(`File created at: ${path}/.env`));
 
-		if (outputTsPath) {
-			const dir = outputTsPath.substring(
-				0,
-				outputTsPath.lastIndexOf('/')
-			);
-			if (!fs.existsSync(dir)) {
-				fs.mkdirSync(dir, { recursive: true });
-			}
-			fs.writeFileSync(
-				outputTsPath,
-				`export const PRIVATEKEY = '${privateKey}';
+    if (outputTsPath) {
+      const dir = outputTsPath.substring(0, outputTsPath.lastIndexOf('/'));
+      if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir, { recursive: true });
+      }
+      fs.writeFileSync(
+        outputTsPath,
+        `export const PRIVATEKEY = '${privateKey}';
 export const ACCOUNT = '${keypair.toSuiAddress()}';
 `
-			);
-			console.log(chalk.green(`File created at: ${outputTsPath}\n`));
-		}
+      );
+      console.log(chalk.green(`File created at: ${outputTsPath}\n`));
+    }
 
-		console.log(
-			chalk.blue(`Force generate new Account: ${keypair.toSuiAddress()}`)
-		);
-		return;
-	}
+    console.log(chalk.blue(`Force generate new Account: ${keypair.toSuiAddress()}`));
+    return;
+  }
 
-	// Check if .env file exists and has content
-	try {
-		const envContent = fs.readFileSync(`${path}/.env`, 'utf8');
-		const match = envContent.match(/PRIVATE_KEY=(.+)/);
-		if (match && match[1]) {
-			privateKey = match[1];
-			const dubhe = new Dubhe({ secretKey: privateKey });
-			const keypair = dubhe.getSigner();
+  // Check if .env file exists and has content
+  try {
+    const envContent = fs.readFileSync(`${path}/.env`, 'utf8');
+    const match = envContent.match(/PRIVATE_KEY=(.+)/);
+    if (match && match[1]) {
+      privateKey = match[1];
+      const dubhe = new Dubhe({ secretKey: privateKey });
+      const keypair = dubhe.getSigner();
 
-			if (outputTsPath) {
-				const dir = outputTsPath.substring(
-					0,
-					outputTsPath.lastIndexOf('/')
-				);
-				if (!fs.existsSync(dir)) {
-					fs.mkdirSync(dir, { recursive: true });
-				}
-				fs.writeFileSync(
-					outputTsPath,
-					`export const PRIVATEKEY = '${privateKey}';
+      if (outputTsPath) {
+        const dir = outputTsPath.substring(0, outputTsPath.lastIndexOf('/'));
+        if (!fs.existsSync(dir)) {
+          fs.mkdirSync(dir, { recursive: true });
+        }
+        fs.writeFileSync(
+          outputTsPath,
+          `export const PRIVATEKEY = '${privateKey}';
 export const ACCOUNT = '${keypair.toSuiAddress()}';
 `
-				);
-				console.log(chalk.green(`File created at: ${outputTsPath}\n`));
-			}
+        );
+        console.log(chalk.green(`File created at: ${outputTsPath}\n`));
+      }
 
-			console.log(
-				chalk.blue(`Using existing Account: ${keypair.toSuiAddress()}`)
-			);
-			return;
-		}
-	} catch (error) {
-		// .env file doesn't exist or failed to read, continue to generate new account
-	}
+      console.log(chalk.blue(`Using existing Account: ${keypair.toSuiAddress()}`));
+      return;
+    }
+  } catch (error) {
+    // .env file doesn't exist or failed to read, continue to generate new account
+  }
 
-	// If no existing private key, generate new account
-	const dubhe = new Dubhe();
-	const keypair = dubhe.getSigner();
-	privateKey = keypair.getSecretKey();
-	fs.writeFileSync(`${path}/.env`, `PRIVATE_KEY=${privateKey}`);
-	console.log(chalk.green(`File created at: ${path}/.env`));
+  // If no existing private key, generate new account
+  const dubhe = new Dubhe();
+  const keypair = dubhe.getSigner();
+  privateKey = keypair.getSecretKey();
+  fs.writeFileSync(`${path}/.env`, `PRIVATE_KEY=${privateKey}`);
+  console.log(chalk.green(`File created at: ${path}/.env`));
 
-	if (outputTsPath) {
-		const dir = outputTsPath.substring(0, outputTsPath.lastIndexOf('/'));
-		if (!fs.existsSync(dir)) {
-			fs.mkdirSync(dir, { recursive: true });
-		}
-		fs.writeFileSync(
-			outputTsPath,
-			`export const PRIVATEKEY = '${privateKey}';
+  if (outputTsPath) {
+    const dir = outputTsPath.substring(0, outputTsPath.lastIndexOf('/'));
+    if (!fs.existsSync(dir)) {
+      fs.mkdirSync(dir, { recursive: true });
+    }
+    fs.writeFileSync(
+      outputTsPath,
+      `export const PRIVATEKEY = '${privateKey}';
 export const ACCOUNT = '${keypair.toSuiAddress()}';
 `
-		);
-		console.log(chalk.green(`File created at: ${outputTsPath}\n`));
-	}
+    );
+    console.log(chalk.green(`File created at: ${outputTsPath}\n`));
+  }
 
-	console.log(chalk.blue(`Generate new Account: ${keypair.toSuiAddress()}`));
+  console.log(chalk.blue(`Generate new Account: ${keypair.toSuiAddress()}`));
 }