@0xobelisk/sui-cli 1.1.4 → 1.1.6

package/src/utils/queryStorage.ts

@@ -6,115 +6,115 @@ import * as fs from 'fs';
 import * as path from 'path';
 
 function validateParams(storageType: string, params: any[]): boolean {
-	const formatStorageType = storageType.split('<')[0].trim();
-	switch (formatStorageType) {
-		case 'StorageValue':
-			return params.length === 0;
-		case 'StorageMap':
-			return params.length === 1;
-		case 'StorageDoubleMap':
-			return params.length === 2;
-		default:
-			return false;
-	}
+  const formatStorageType = storageType.split('<')[0].trim();
+  switch (formatStorageType) {
+    case 'StorageValue':
+      return params.length === 0;
+    case 'StorageMap':
+      return params.length === 1;
+    case 'StorageDoubleMap':
+      return params.length === 2;
+    default:
+      return false;
+  }
 }
 
 function getExpectedParamsCount(storageType: string): number {
-	const formatStorageType = storageType.split('<')[0].trim();
-	switch (formatStorageType) {
-		case 'StorageValue':
-			return 0;
-		case 'StorageMap':
-			return 1;
-		case 'StorageDoubleMap':
-			return 2;
-		default:
-			return 0;
-	}
+  const formatStorageType = storageType.split('<')[0].trim();
+  switch (formatStorageType) {
+    case 'StorageValue':
+      return 0;
+    case 'StorageMap':
+      return 1;
+    case 'StorageDoubleMap':
+      return 2;
+    default:
+      return 0;
+  }
 }
 
 export async function queryStorage({
-	dubheConfig,
-	schema,
-	params,
-	network,
-	objectId,
-	packageId,
-	metadataFilePath,
+  dubheConfig,
+  schema,
+  params,
+  network,
+  objectId,
+  packageId,
+  metadataFilePath
 }: {
-	dubheConfig: DubheConfig;
-	schema: string;
-	params?: any[];
-	network: 'mainnet' | 'testnet' | 'devnet' | 'localnet';
-	objectId?: string;
-	packageId?: string;
-	metadataFilePath?: string;
+  dubheConfig: DubheConfig;
+  schema: string;
+  params?: any[];
+  network: 'mainnet' | 'testnet' | 'devnet' | 'localnet';
+  objectId?: string;
+  packageId?: string;
+  metadataFilePath?: string;
 }) {
-	const privateKey = process.env.PRIVATE_KEY;
-	if (!privateKey) {
-		throw new DubheCliError(
-			`Missing PRIVATE_KEY environment variable.
+  const privateKey = process.env.PRIVATE_KEY;
+  if (!privateKey) {
+    throw new DubheCliError(
+      `Missing PRIVATE_KEY environment variable.
 Run 'echo "PRIVATE_KEY=YOUR_PRIVATE_KEY" > .env'
 in your contracts directory to use the default sui private key.`
-		);
-	}
-	const privateKeyFormat = validatePrivateKey(privateKey);
-	if (privateKeyFormat === false) {
-		throw new DubheCliError(`Please check your privateKey.`);
-	}
-
-	const path = process.cwd();
-	const projectPath = `${path}/contracts/${dubheConfig.name}`;
-
-	packageId = packageId || (await getOldPackageId(projectPath, network));
-
-	objectId = objectId || (await getSchemaId(projectPath, network));
-
-	let metadata;
-	if (metadataFilePath) {
-		metadata = await loadMetadataFromFile(metadataFilePath);
-	} else {
-		metadata = await loadMetadata(network, packageId);
-	}
-	if (!metadata) {
-		throw new DubheCliError(
-			`Metadata file not found. Please provide a metadata file path or set the packageId.`
-		);
-	}
-
-	if (!dubheConfig.schemas[schema]) {
-		throw new DubheCliError(
-			`Schema "${schema}" not found in dubhe config. Available schemas: ${Object.keys(
-				dubheConfig.schemas
-			).join(', ')}`
-		);
-	}
-
-	const storageType = dubheConfig.schemas[schema];
-
-	const processedParams = params || [];
-	if (!validateParams(storageType, processedParams)) {
-		throw new Error(
-			`Invalid params count for ${storageType}. ` +
-				`Expected: ${getExpectedParamsCount(storageType)}, ` +
-				`Got: ${processedParams.length}`
-		);
-	}
-
-	const dubhe = new Dubhe({
-		secretKey: privateKeyFormat,
-		networkType: network,
-		packageId,
-		metadata,
-	});
-	const result = await dubhe.parseState({
-		schema,
-		objectId,
-		storageType,
-		params: processedParams,
-	});
-
-	console.log(result);
+    );
+  }
+  const privateKeyFormat = validatePrivateKey(privateKey);
+  if (privateKeyFormat === false) {
+    throw new DubheCliError(`Please check your privateKey.`);
+  }
+
+  const path = process.cwd();
+  const projectPath = `${path}/contracts/${dubheConfig.name}`;
+
+  packageId = packageId || (await getOldPackageId(projectPath, network));
+
+  objectId = objectId || (await getSchemaId(projectPath, network));
+
+  let metadata;
+  if (metadataFilePath) {
+    metadata = await loadMetadataFromFile(metadataFilePath);
+  } else {
+    metadata = await loadMetadata(network, packageId);
+  }
+  if (!metadata) {
+    throw new DubheCliError(
+      `Metadata file not found. Please provide a metadata file path or set the packageId.`
+    );
+  }
+
+  if (!dubheConfig.schemas[schema]) {
+    throw new DubheCliError(
+      `Schema "${schema}" not found in dubhe config. Available schemas: ${Object.keys(
+        dubheConfig.schemas
+      ).join(', ')}`
+    );
+  }
+
+  const storageType = dubheConfig.schemas[schema];
+
+  const processedParams = params || [];
+  if (!validateParams(storageType, processedParams)) {
+    throw new Error(
+      `Invalid params count for ${storageType}. ` +
+        `Expected: ${getExpectedParamsCount(storageType)}, ` +
+        `Got: ${processedParams.length}`
+    );
+  }
+
+  const dubhe = new Dubhe({
+    secretKey: privateKeyFormat,
+    networkType: network,
+    packageId,
+    metadata
+  });
+  const result = await dubhe.parseState({
+    schema,
+    objectId,
+    storageType,
+    params: processedParams
+  });
+
+  console.log(result);
 }
 
 /**
@@ -125,31 +125,31 @@ in your contracts directory to use the default sui private key.`
  * @returns Constructed metadata object
  */
 export async function loadMetadataFromFile(metadataFilePath: string) {
-	// Verify file extension is .json
-	if (path.extname(metadataFilePath) !== '.json') {
-		throw new Error('Metadata file must be in JSON format');
-	}
-
-	try {
-		// Read JSON file content
-		const rawData = fs.readFileSync(metadataFilePath, 'utf8');
-		const jsonData = JSON.parse(rawData);
-
-		// Validate JSON structure
-		if (!jsonData || typeof jsonData !== 'object') {
-			throw new Error('Invalid JSON format');
-		}
-
-		// Construct metadata structure
-		const metadata = {
-			...jsonData,
-		};
-
-		return metadata;
-	} catch (error) {
-		if (error instanceof Error) {
-			throw new Error(`Failed to read metadata file: ${error.message}`);
-		}
-		throw error;
-	}
+  // Verify file extension is .json
+  if (path.extname(metadataFilePath) !== '.json') {
+    throw new Error('Metadata file must be in JSON format');
+  }
+
+  try {
+    // Read JSON file content
+    const rawData = fs.readFileSync(metadataFilePath, 'utf8');
+    const jsonData = JSON.parse(rawData);
+
+    // Validate JSON structure
+    if (!jsonData || typeof jsonData !== 'object') {
+      throw new Error('Invalid JSON format');
+    }
+
+    // Construct metadata structure
+    const metadata = {
+      ...jsonData
+    };
+
+    return metadata;
+  } catch (error) {
+    if (error instanceof Error) {
+      throw new Error(`Failed to read metadata file: ${error.message}`);
+    }
+    throw error;
+  }
 }

package/src/utils/startNode.ts

@@ -1,138 +1,120 @@
 import { execSync, spawn } from 'child_process';
 import chalk from 'chalk';
 import { printDubhe } from './printDubhe';
-import {delay, DubheCliError, publishDubheFramework, validatePrivateKey} from '../utils';
+import { delay, DubheCliError, validatePrivateKey } from '../utils';
 import { Dubhe } from '@0xobelisk/sui-client';
-import {DubheConfig} from "@0xobelisk/sui-common";
 
 function isSuiStartRunning(): boolean {
-	try {
-		const cmd =
-			process.platform === 'win32'
-				? `tasklist /FI "IMAGENAME eq sui.exe" /FO CSV /NH`
-				: 'pgrep -f "sui start"';
+  try {
+    const cmd =
+      process.platform === 'win32'
+        ? `tasklist /FI "IMAGENAME eq sui.exe" /FO CSV /NH`
+        : 'pgrep -f "sui start"';
 
-		const result = execSync(cmd).toString().trim();
-		return process.platform === 'win32'
-			? result.toLowerCase().includes('sui.exe')
-			: result.length > 0;
-	} catch (error) {
-		return false;
-	}
+    const result = execSync(cmd).toString().trim();
+    return process.platform === 'win32'
+      ? result.toLowerCase().includes('sui.exe')
+      : result.length > 0;
+  } catch (error) {
+    return false;
+  }
 }
 
 async function printAccounts() {
-	// These private keys are used for testing purposes only, do not use them in production.
-	const privateKeys = [
-		'suiprivkey1qq3ez3dje66l8pypgxynr7yymwps6uhn7vyczespj84974j3zya0wdpu76v',
-		'suiprivkey1qp6vcyg8r2x88fllmjmxtpzjl95gd9dugqrgz7xxf50w6rqdqzetg7x4d7s',
-		'suiprivkey1qpy3a696eh3m55fwa8h38ss063459u4n2dm9t24w2hlxxzjp2x34q8sdsnc',
-		'suiprivkey1qzxwp29favhzrjd95f6uj9nskjwal6nh9g509jpun395y6g72d6jqlmps4c',
-		'suiprivkey1qzhq4lv38sesah4uzsqkkmeyjx860xqjdz8qgw36tmrdd5tnle3evxpng57',
-		'suiprivkey1qzez45sjjsepjgtksqvpq6jw7dzw3zq0dx7a4sulfypd73acaynw5jl9x2c',
-	];
-	console.log('📝Accounts');
-	console.log('==========');
-	privateKeys.forEach((privateKey, index) => {
-		const dubhe = new Dubhe({ secretKey: privateKey });
-		const keypair = dubhe.getSigner();
-		spawn(
-			'curl',
-			[
-				'--location',
-				'--request',
-				'POST',
-				'http://127.0.0.1:9123/gas',
-				'--header',
-				'Content-Type: application/json',
-				'--data-raw',
-				`{"FixedAmountRequest": {"recipient": "${keypair.toSuiAddress()}"}}`,
-			],
-			{
-				env: { ...process.env },
-				stdio: 'ignore',
-				detached: true,
-			}
-		);
-		console.log(
-			`  ┌─ Account #${index}: ${keypair.toSuiAddress()}(1000 SUI)`
-		);
-		console.log(`  └─ Private Key: ${privateKey}`);
-	});
-	console.log('==========');
-	console.log(
-		chalk.yellow(
-			'ℹ️ WARNING: These accounts, and their private keys, are publicly known.'
-		)
-	);
-	console.log(
-		chalk.yellow(
-			'Any funds sent to them on Mainnet or any other live network WILL BE LOST.'
-		)
-	);
+  // These private keys are used for testing purposes only, do not use them in production.
+  const privateKeys = [
+    'suiprivkey1qq3ez3dje66l8pypgxynr7yymwps6uhn7vyczespj84974j3zya0wdpu76v',
+    'suiprivkey1qp6vcyg8r2x88fllmjmxtpzjl95gd9dugqrgz7xxf50w6rqdqzetg7x4d7s',
+    'suiprivkey1qpy3a696eh3m55fwa8h38ss063459u4n2dm9t24w2hlxxzjp2x34q8sdsnc',
+    'suiprivkey1qzxwp29favhzrjd95f6uj9nskjwal6nh9g509jpun395y6g72d6jqlmps4c',
+    'suiprivkey1qzhq4lv38sesah4uzsqkkmeyjx860xqjdz8qgw36tmrdd5tnle3evxpng57',
+    'suiprivkey1qzez45sjjsepjgtksqvpq6jw7dzw3zq0dx7a4sulfypd73acaynw5jl9x2c'
+  ];
+  console.log('📝Accounts');
+  console.log('==========');
+  privateKeys.forEach((privateKey, index) => {
+    const dubhe = new Dubhe({ secretKey: privateKey });
+    const keypair = dubhe.getSigner();
+    spawn(
+      'curl',
+      [
+        '--location',
+        '--request',
+        'POST',
+        'http://127.0.0.1:9123/gas',
+        '--header',
+        'Content-Type: application/json',
+        '--data-raw',
+        `{"FixedAmountRequest": {"recipient": "${keypair.toSuiAddress()}"}}`
+      ],
+      {
+        env: { ...process.env },
+        stdio: 'ignore',
+        detached: true
+      }
+    );
+    console.log(`  ┌─ Account #${index}: ${keypair.toSuiAddress()}(1000 SUI)`);
+    console.log(`  └─ Private Key: ${privateKey}`);
+  });
+  console.log('==========');
+  console.log(
+    chalk.yellow('ℹ️ WARNING: These accounts, and their private keys, are publicly known.')
+  );
+  console.log(
+    chalk.yellow('Any funds sent to them on Mainnet or any other live network WILL BE LOST.')
+  );
 }
-export async function startLocalNode(dubheConfig: DubheConfig) {
-	if (isSuiStartRunning()) {
-		console.log(chalk.yellow('\n⚠️  Warning: Local Node Already Running'));
-		console.log(chalk.yellow('  ├─ Cannot start a new instance'));
-		console.log(
-			chalk.yellow('  └─ Please stop the existing process first')
-		);
-		return;
-	}
+export async function startLocalNode() {
+  if (isSuiStartRunning()) {
+    console.log(chalk.yellow('\n⚠️  Warning: Local Node Already Running'));
+    console.log(chalk.yellow('  ├─ Cannot start a new instance'));
+    console.log(chalk.yellow('  └─ Please stop the existing process first'));
+    return;
+  }
 
-	printDubhe();
-	console.log('🚀 Starting Local Node...');
-	try {
-		const suiProcess = spawn(
-			'sui',
-			['start', '--with-faucet', '--force-regenesis'],
-			{
-				env: { ...process.env, RUST_LOG: 'off,sui_node=info' },
-				stdio: 'ignore',
-				detached: true,
-			}
-		);
+  printDubhe();
+  console.log('🚀 Starting Local Node...');
+  try {
+    const suiProcess = spawn('sui', ['start', '--with-faucet', '--force-regenesis'], {
+      env: { ...process.env, RUST_LOG: 'off,sui_node=info' },
+      stdio: 'ignore',
+      detached: true
+    });
 
-		suiProcess.on('error', error => {
-			console.error(chalk.red('\n❌ Failed to Start Local Node'));
-			console.error(chalk.red(`  └─ Error: ${error.message}`));
-		});
-		await delay(5000);
-		console.log('  ├─ Faucet: Enabled');
-		console.log('  └─ Force Regenesis: Yes');
-		console.log('  └─ HTTP server: http://127.0.0.1:9000/');
-		console.log('  └─ Faucet server: http://127.0.0.1:9123/');
-		await printAccounts();
+    suiProcess.on('error', (error) => {
+      console.error(chalk.red('\n❌ Failed to Start Local Node'));
+      console.error(chalk.red(`  └─ Error: ${error.message}`));
+    });
+    await delay(5000);
+    console.log('  ├─ Faucet: Enabled');
+    console.log('  └─ Force Regenesis: Yes');
+    console.log('  └─ HTTP server: http://127.0.0.1:9000/');
+    console.log('  └─ Faucet server: http://127.0.0.1:9123/');
 
-		await delay(2000);
+    await printAccounts();
 
-		const privateKeyFormat = validatePrivateKey(
-			'suiprivkey1qzez45sjjsepjgtksqvpq6jw7dzw3zq0dx7a4sulfypd73acaynw5jl9x2c'
-		);
-		if (privateKeyFormat === false) {
-			throw new DubheCliError(`Please check your privateKey.`);
-		}
+    await delay(2000);
 
-		console.log(chalk.green('🎉 Local environment is ready!'))
-		const dubhe = new Dubhe({
-			secretKey: privateKeyFormat,
-			networkType: "localnet",
-		});
+    const privateKeyFormat = validatePrivateKey(
+      'suiprivkey1qzez45sjjsepjgtksqvpq6jw7dzw3zq0dx7a4sulfypd73acaynw5jl9x2c'
+    );
+    if (privateKeyFormat === false) {
+      throw new DubheCliError(`Please check your privateKey.`);
+    }
 
-		await publishDubheFramework(dubheConfig, dubhe, 'localnet');
+    console.log(chalk.green('🎉 Local environment is ready!'));
 
-		process.on('SIGINT', () => {
-			console.log(chalk.yellow('\n🔔 Stopping Local Node...'));
-			if (suiProcess) {
-				suiProcess.kill();
-				console.log(chalk.green('✅ Local Node Stopped'));
-			}
-			process.exit();
-		});
-	} catch (error: any) {
-		console.error(chalk.red('\n❌ Failed to Start Local Node'));
-		console.error(chalk.red(`  └─ Error: ${error.message}`));
-		process.exit(1);
-	}
-}
+    process.on('SIGINT', () => {
+      console.log(chalk.yellow('\n🔔 Stopping Local Node...'));
+      if (suiProcess) {
+        suiProcess.kill();
+        console.log(chalk.green('✅ Local Node Stopped'));
+      }
+      process.exit();
+    });
+  } catch (error: any) {
+    console.error(chalk.red('\n❌ Failed to Start Local Node'));
+    console.error(chalk.red(`  └─ Error: ${error.message}`));
+    process.exit(1);
+  }
+}

package/src/utils/storeConfig.ts

@@ -5,66 +5,54 @@ import { DeploymentJsonType } from './utils';
 import { DubheConfig } from '@0xobelisk/sui-common';
 
 async function getDeploymentJson(
-	projectPath: string,
-	network: string
+  projectPath: string,
+  network: string
 ): Promise<DeploymentJsonType> {
-	try {
-		const data = await fsAsync.readFile(
-			`${projectPath}/.history/sui_${network}/latest.json`,
-			'utf8'
-		);
-		return JSON.parse(data) as DeploymentJsonType;
-	} catch (error) {
-		throw new Error(
-			`read .history/sui_${network}/latest.json failed. ${error}`
-		);
-	}
+  try {
+    const data = await fsAsync.readFile(
+      `${projectPath}/.history/sui_${network}/latest.json`,
+      'utf8'
+    );
+    return JSON.parse(data) as DeploymentJsonType;
+  } catch (error) {
+    throw new Error(`read .history/sui_${network}/latest.json failed. ${error}`);
+  }
 }
 
-function storeConfig(
-	network: string,
-	packageId: string,
-	schemaId: string,
-	outputPath: string
-) {
-	let code = `type NetworkType = 'testnet' | 'mainnet' | 'devnet' | 'localnet';
+function storeConfig(network: string, packageId: string, schemaId: string, outputPath: string) {
+  let code = `type NetworkType = 'testnet' | 'mainnet' | 'devnet' | 'localnet';
 
 export const NETWORK: NetworkType = '${network}';
 export const PACKAGE_ID = '${packageId}'
 export const SCHEMA_ID = '${schemaId}'
-`
+`;
 
-	// if (outputPath) {
-	writeOutput(code, outputPath, 'storeConfig');
-	// writeOutput(code, `${path}/src/chain/config.ts`, 'storeConfig');
-	// }
+  // if (outputPath) {
+  writeOutput(code, outputPath, 'storeConfig');
+  // writeOutput(code, `${path}/src/chain/config.ts`, 'storeConfig');
+  // }
 }
 
 async function writeOutput(
-	output: string,
-	fullOutputPath: string,
-	logPrefix?: string
+  output: string,
+  fullOutputPath: string,
+  logPrefix?: string
 ): Promise<void> {
-	mkdirSync(dirname(fullOutputPath), { recursive: true });
+  mkdirSync(dirname(fullOutputPath), { recursive: true });
 
-	writeFileSync(fullOutputPath, output);
-	if (logPrefix !== undefined) {
-		console.log(`${logPrefix}: ${fullOutputPath}`);
-	}
+  writeFileSync(fullOutputPath, output);
+  if (logPrefix !== undefined) {
+    console.log(`${logPrefix}: ${fullOutputPath}`);
+  }
 }
 
 export async function storeConfigHandler(
-	dubheConfig: DubheConfig,
-	network: 'mainnet' | 'testnet' | 'devnet' | 'localnet',
-	outputPath: string
+  dubheConfig: DubheConfig,
+  network: 'mainnet' | 'testnet' | 'devnet' | 'localnet',
+  outputPath: string
 ) {
-	const path = process.cwd();
-	const contractPath = `${path}/contracts/${dubheConfig.name}`;
-	const deployment = await getDeploymentJson(contractPath, network);
-	storeConfig(
-		deployment.network,
-		deployment.packageId,
-		deployment.schemaId,
-		outputPath
-	);
+  const path = process.cwd();
+  const contractPath = `${path}/contracts/${dubheConfig.name}`;
+  const deployment = await getDeploymentJson(contractPath, network);
+  storeConfig(deployment.network, deployment.packageId, deployment.schemaId, outputPath);
 }