@0xobelisk/sui-cli 0.5.16 → 0.5.18

package/src/commands/upgrade.ts

@@ -1,53 +1,53 @@
-import type { CommandModule } from "yargs";
-import { logError } from "../utils/errors";
-import { upgradeHandler } from "../utils";
-import { ObeliskConfig, loadConfig, ValueType } from "@0xobelisk/sui-common";
-
-type Options = {
-  network: any;
-  configPath: string;
-};
-
-const commandModule: CommandModule<Options, Options> = {
-  command: "upgrade",
-
-  describe: "Upgrade your move contracts",
-
-  builder(yargs) {
-    return yargs.options({
-      network: {
-        type: "string",
-        choices: ["mainnet", "testnet", "devnet", "localnet"],
-        desc: "Network of the node (mainnet/testnet/devnet/localnet)",
-      },
-      configPath: {
-        type: "string",
-        default: "obelisk.config.ts",
-        decs: "Path to the config file",
-      },
-    });
-  },
-
-  async handler({ network, configPath }) {
-    try {
-      const obeliskConfig = (await loadConfig(configPath)) as ObeliskConfig;
-
-      let schemaNames = Object.keys(obeliskConfig.schemas).filter(
-        (key) =>
-          !(
-            typeof obeliskConfig.schemas === "object" &&
-            "ephemeral" in obeliskConfig.schemas &&
-            (obeliskConfig.schemas[key] as ValueType).ephemeral
-          )
-      );
-
-      await upgradeHandler(obeliskConfig.name, network, schemaNames);
-    } catch (error: any) {
-      logError(error);
-      process.exit(1);
-    }
-    process.exit(0);
-  },
-};
-
-export default commandModule;
+// import type { CommandModule } from "yargs";
+// import { logError } from "../utils/errors";
+// import { upgradeHandler } from "../utils";
+// import { ObeliskConfig, loadConfig, ValueType } from "@0xobelisk/sui-common";
+
+// type Options = {
+//   network: any;
+//   configPath: string;
+// };
+
+// const commandModule: CommandModule<Options, Options> = {
+//   command: "upgrade",
+
+//   describe: "Upgrade your move contracts",
+
+//   builder(yargs) {
+//     return yargs.options({
+//       network: {
+//         type: "string",
+//         choices: ["mainnet", "testnet", "devnet", "localnet"],
+//         desc: "Network of the node (mainnet/testnet/devnet/localnet)",
+//       },
+//       configPath: {
+//         type: "string",
+//         default: "obelisk.config.ts",
+//         decs: "Path to the config file",
+//       },
+//     });
+//   },
+
+//   async handler({ network, configPath }) {
+//     try {
+//       const obeliskConfig = (await loadConfig(configPath)) as ObeliskConfig;
+
+//       let schemaNames = Object.keys(obeliskConfig.schemas).filter(
+//         (key) =>
+//           !(
+//             typeof obeliskConfig.schemas === "object" &&
+//             "ephemeral" in obeliskConfig.schemas &&
+//             (obeliskConfig.schemas[key] as ValueType).ephemeral
+//           )
+//       );
+
+//       await upgradeHandler(obeliskConfig.name, network, schemaNames);
+//     } catch (error: any) {
+//       logError(error);
+//       process.exit(1);
+//     }
+//     process.exit(0);
+//   },
+// };
+
+// export default commandModule;

package/src/utils/index.ts

@@ -1,5 +1,5 @@
-export * from "./publishHandler";
-export * from "./upgradeHandler";
-export * from "./errors";
-export * from "./printObelisk";
-export * from "./utils";
+export * from './publishHandler';
+// export * from "./upgradeHandler";
+export * from './errors';
+export * from './printObelisk';
+export * from './utils';

package/src/utils/localnode/index.ts

@@ -0,0 +1,3 @@
+export { startLocalnode } from './start';
+export { checkLocalNodeStatus } from './status';
+export { stopLocalnode } from './stop';

package/src/utils/localnode/start.ts

@@ -0,0 +1,87 @@
+import { execSync, spawn } from 'child_process';
+import chalk from 'chalk';
+
+function isSuiStartRunning(): boolean {
+	try {
+		const result = execSync('pgrep -f "sui start"').toString().trim();
+		return result.length > 0;
+	} catch (error) {
+		return false;
+	}
+}
+
+export async function startLocalnode(background: boolean = false) {
+	console.log(chalk.blue('Checking if sui start process is running...'));
+
+	if (isSuiStartRunning()) {
+		console.log(
+			chalk.yellow('Warning: sui start process is already running.')
+		);
+		console.log(
+			chalk.yellow(
+				'Cannot start a new local node. Please stop the existing sui start process first.'
+			)
+		);
+		return;
+	}
+
+	console.log(chalk.green('Starting local node...'));
+	try {
+		const suiProcess = spawn(
+			'sui',
+			['start', '--with-faucet', '--force-regenesis'],
+			{
+				env: { ...process.env, RUST_LOG: 'off,sui_node=info' },
+				stdio: background ? 'ignore' : 'inherit',
+				detached: background,
+			}
+		);
+
+		suiProcess.on('error', error => {
+			console.error(chalk.red('Failed to start local node:'), error);
+		});
+
+		if (!background) {
+			suiProcess.on('exit', code => {
+				if (code === 0) {
+					console.log(chalk.green('Local node has exited normally'));
+				} else {
+					console.error(
+						chalk.red(
+							`Local node exited abnormally with code: ${code}`
+						)
+					);
+				}
+			});
+
+			console.log(chalk.cyan('Local node is running...'));
+			console.log(chalk.cyan('Press Ctrl+C to stop the local node'));
+
+			// Keep the script running
+			await new Promise(() => {});
+		} else {
+			suiProcess.unref();
+			console.log(
+				chalk.green('Local node has been started in the background')
+			);
+			console.log(
+				chalk.cyan(
+					'Use "pgrep -f \'sui start\'" to check the process ID'
+				)
+			);
+			console.log(
+				chalk.cyan(
+					'Use "kill <process_id>" to stop the background node'
+				)
+			);
+		}
+	} catch (error) {
+		console.error(chalk.red('Failed to start local node:'), error);
+	}
+}
+
+// Get the background flag from command line arguments
+const args = process.argv.slice(2);
+const runInBackground = args.includes('--background') || args.includes('-b');
+
+// startLocalnode(runInBackground);

package/src/utils/localnode/status.ts

@@ -0,0 +1,39 @@
+import { execSync } from 'child_process';
+import chalk from 'chalk';
+
+export async function checkLocalNodeStatus() {
+	try {
+		const output = execSync(
+			"ps aux | grep '[s]ui start --with-faucet --force-regenesis'",
+			{
+				encoding: 'utf8',
+			}
+		);
+
+		const lines = output.split('\n').filter(Boolean);
+
+		if (lines.length > 0) {
+			console.log(chalk.green('✓ Sui Local Node Status: Running'));
+			console.log(chalk.gray('Process Details:'));
+			for (const line of lines) {
+				console.log(chalk.gray(`  ${line}`));
+			}
+		} else {
+			console.log(chalk.red('✗ Sui Local Node Status: Not Running'));
+			console.log(
+				chalk.yellow(
+					'Tip: Use `pnpm run start-localnode` to start the local node'
+				)
+			);
+		}
+	} catch (error) {
+		console.log(chalk.red('✗ Sui Local Node Status: Not Running'));
+		console.log(
+			chalk.yellow(
+				'Tip: Use `pnpm run start-localnode` to start the local node'
+			)
+		);
+	}
+}
+
+// checkLocalNodeStatus();

package/src/utils/localnode/stop.ts

@@ -0,0 +1,35 @@
+import { execSync } from 'child_process';
+
+export async function stopLocalnode() {
+	console.log('Stopping local node...');
+
+	try {
+		// Find localnode process using ps command
+		const output = execSync(
+			"ps aux | grep '[s]ui start --with-faucet --force-regenesis'",
+			{
+				encoding: 'utf8',
+			}
+		);
+
+		if (!output) {
+			console.log('No running local node process found');
+			return;
+		}
+
+		// Get process ID
+		const pid = output.toString().split(/\s+/)[1];
+
+		// Kill the process
+		process.kill(Number(pid));
+		console.log('✅ Local node stopped successfully');
+	} catch (error: any) {
+		if (error.code === 'ESRCH') {
+			console.log('No running local node process found');
+		} else {
+			console.error('❌ Error stopping local node:', error.message);
+		}
+	}
+}
+
+// stopLocalnode();

package/src/utils/publishHandler.ts

@@ -11,17 +11,29 @@ import { ObeliskCliError } from './errors';
 import {
 	updateVersionInFile,
 	saveContractData,
-	validatePrivateKey, schema,
+	validatePrivateKey,
+	schema,
 } from './utils';
-import {log} from "node:util";
+
+async function getDappsObjectId(
+	network: 'mainnet' | 'testnet' | 'devnet' | 'localnet'
+) {
+	switch (network) {
+		case 'testnet':
+			return '0xa66942c08d9fc318a70ab9d0cfd7e75f1a2dd1ac31aff12fde008d25bfa9604b';
+		default:
+			return '0xa66942c08d9fc318a70ab9d0cfd7e75f1a2dd1ac31aff12fde008d25bfa9604b';
+	}
+}
 
 export async function publishHandler(
 	name: string,
-	network: 'mainnet' | 'testnet' | 'devnet' | 'localnet'
+	network: 'mainnet' | 'testnet' | 'devnet' | 'localnet',
+	dappsObjectId?: string
 ) {
 	const path = process.cwd();
 	const projectPath = `${path}/contracts/${name}`;
-
+	dappsObjectId = dappsObjectId || (await getDappsObjectId(network));
 	const privateKey = process.env.PRIVATE_KEY;
 	if (!privateKey)
 		throw new ObeliskCliError(
@@ -71,10 +83,7 @@ in your contracts directory to use the default sui private key.`
 		modules,
 		dependencies,
 	});
-	tx.transferObjects(
-		[upgradeCap],
-		keypair.toSuiAddress()
-	);
+	tx.transferObjects([upgradeCap], keypair.toSuiAddress());
 
 	let result: SuiTransactionBlockResponse;
 	try {
@@ -126,8 +135,8 @@ in your contracts directory to use the default sui private key.`
 	deployHookTx.moveCall({
 		target: `${packageId}::deploy_hook::run`,
 		arguments: [
-			deployHookTx.object("0xa66942c08d9fc318a70ab9d0cfd7e75f1a2dd1ac31aff12fde008d25bfa9604b"),
-			deployHookTx.object("0x6"),
+			deployHookTx.object(dappsObjectId),
+			deployHookTx.object('0x6'),
 		],
 	});
 
@@ -138,7 +147,7 @@ in your contracts directory to use the default sui private key.`
 			transaction: deployHookTx,
 			options: {
 				showEffects: true,
-				showObjectChanges: true
+				showObjectChanges: true,
 			},
 		});
 	} catch (error: any) {
@@ -159,10 +168,17 @@ in your contracts directory to use the default sui private key.`
 		);
 		deployHookResult.objectChanges?.map(object => {
 			if (
-				object.type === 'created' && object.objectType.includes("schema")
+				object.type === 'created' &&
+				object.objectType.includes('schema')
 			) {
-				console.log(chalk.blue(`${name} Schema Object id: ${object.objectId}`));
-				console.log(chalk.blue(`${name} Schema Object type: ${object.objectType}`));
+				console.log(
+					chalk.blue(`${name} Schema Object id: ${object.objectId}`)
+				);
+				console.log(
+					chalk.blue(
+						`${name} Schema Object type: ${object.objectType}`
+					)
+				);
 				schemas.push({
 					name: object.objectType,
 					objectId: object.objectId,