@0xobelisk/sui-cli 1.2.0-pre.2 → 1.2.0-pre.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xobelisk/sui-cli",
-  "version": "1.2.0-pre.2",
+  "version": "1.2.0-pre.21",
   "description": "Tookit for interacting with move eps framework",
   "keywords": [
     "sui",
@@ -50,8 +50,8 @@
     "yargs": "^17.7.1",
     "zod": "^3.22.3",
     "zod-validation-error": "^1.3.0",
-    "@0xobelisk/sui-client": "1.2.0-pre.2",
-    "@0xobelisk/sui-common": "1.2.0-pre.2"
+    "@0xobelisk/sui-client": "1.2.0-pre.21",
+    "@0xobelisk/sui-common": "1.2.0-pre.21"
   },
   "devDependencies": {
     "@types/ejs": "^3.1.1",

package/src/commands/build.ts

@@ -44,7 +44,7 @@ const commandModule: CommandModule<Options, Options> = {
       console.log('🚀 Running move build');
       const dubheConfig = (await loadConfig(configPath)) as DubheConfig;
       const path = process.cwd();
-      const projectPath = `${path}/contracts/${dubheConfig.name}`;
+      const projectPath = `${path}/src/${dubheConfig.name}`;
       await switchEnv(network);
       await updateDubheDependency(projectPath + '/Move.toml', network);
       const command = `sui move build --path ${projectPath} ${

package/src/commands/index.ts

@@ -15,6 +15,8 @@ import query from './query';
 import call from './call';
 import watch from './watch';
 import wait from './wait';
+import switchEnv from './switchEnv';
+import info from './info';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any -- Each command has different options
 export const commands: CommandModule<any, any>[] = [
@@ -32,5 +34,7 @@ export const commands: CommandModule<any, any>[] = [
   checkBalance,
   configStore,
   watch,
-  wait
+  wait,
+  switchEnv,
+  info
 ];

package/src/commands/info.ts

@@ -0,0 +1,49 @@
+import { CommandModule } from 'yargs';
+import { logError, initializeDubhe } from '../utils';
+import dotenv from 'dotenv';
+import chalk from 'chalk';
+dotenv.config();
+
+type Options = {
+  network: any;
+};
+
+const InfoCommand: CommandModule<Options, Options> = {
+  command: 'info',
+  describe: 'Get information about the current Sui node',
+  builder(yargs) {
+    return yargs.options({
+      network: {
+        type: 'string',
+        choices: ['mainnet', 'testnet', 'devnet', 'localnet'],
+        default: 'localnet',
+        desc: 'Node network (mainnet/testnet/devnet/localnet)'
+      }
+    });
+  },
+  handler: async ({ network }) => {
+    try {
+      const dubhe = initializeDubhe({ network });
+      const keypair = dubhe.getSigner();
+
+      console.log(chalk.blue('Account Information:'));
+      console.log(`  Network: ${chalk.green(network)}`);
+      console.log(`  Address: ${chalk.green(keypair.toSuiAddress())}`);
+
+      try {
+        const balance = await dubhe.getBalance('0x2::sui::SUI');
+        const suiBalance = (Number(balance.totalBalance) / 10 ** 9).toFixed(4);
+        console.log(`  Balance: ${chalk.green(suiBalance)} SUI`);
+      } catch (error) {
+        console.log(
+          `  Balance: ${chalk.red('Failed to fetch balance')} ${chalk.gray('(Network error)')}`
+        );
+      }
+    } catch (error) {
+      logError(error);
+      process.exit(1);
+    }
+  }
+};
+
+export default InfoCommand;

package/src/commands/localnode.ts

@@ -8,17 +8,11 @@ const commandModule: CommandModule = {
 
   builder(yargs) {
     return yargs
-      .option('force-regenesis', {
-        alias: 'f',
-        type: 'boolean',
-        description: 'Force regenesis the local node',
-        default: true
-      });
   },
 
-  async handler(argv) {
+  async handler() {
     try {
-      await startLocalNode({ forceRegenesis: argv['force-regenesis'] as boolean });
+      await startLocalNode();
     } catch (error) {
       console.error('Error executing command:', error);
       process.exit(1);

package/src/commands/switchEnv.ts

@@ -0,0 +1,24 @@
+import type { CommandModule, ArgumentsCamelCase } from 'yargs';
+import { switchEnv } from '../utils';
+
+type Options = {
+  network: 'mainnet' | 'testnet' | 'devnet' | 'localnet';
+};
+
+const commandModule: CommandModule<Options, Options> = {
+  command: 'switch-env',
+  describe: 'Switch environment',
+  builder(yargs) {
+    return yargs.option('network', {
+      type: 'string',
+      choices: ['mainnet', 'testnet', 'devnet', 'localnet'] as const,
+      default: 'localnet',
+      desc: 'Switch to node network (mainnet/testnet/devnet/localnet)'
+    }) as any;
+  },
+  async handler(argv: ArgumentsCamelCase<Options>) {
+    await switchEnv(argv.network as 'mainnet' | 'testnet' | 'devnet' | 'localnet');
+  }
+};
+
+export default commandModule;

package/src/commands/test.ts

@@ -38,7 +38,7 @@ const commandModule: CommandModule<Options, Options> = {
       console.log('🚀 Running move test');
       const dubheConfig = (await loadConfig(configPath)) as DubheConfig;
       const path = process.cwd();
-      const projectPath = `${path}/contracts/${dubheConfig.name}`;
+      const projectPath = `${path}/src/${dubheConfig.name}`;
       const command = `sui move test --path ${projectPath} ${
         test ? ` --test ${test}` : ''
       } --gas-limit ${gasLimit}`;

package/src/dubhe.ts

@@ -16,11 +16,14 @@ yargs(hideBin(process.argv))
   // Use the commands directory to scaffold
   // eslint-disable-next-line @typescript-eslint/no-explicit-any -- command array overload isn't typed, see https://github.com/yargs/yargs/blob/main/docs/advanced.md#esm-hierarchy
   .command(commands as any)
+  .demandCommand(1, 'Please provide a command')
+  .recommendCommands()
   // Enable strict mode.
   .strict()
   // Custom error handler
-  .fail((msg, err) => {
+  .fail((msg, err, yargsInstance) => {
     console.error(chalk.red(msg));
+
     if (msg.includes('Missing required argument')) {
       console.log(
         chalk.yellow(
@@ -28,9 +31,14 @@ yargs(hideBin(process.argv))
         )
       );
     }
-    console.log('');
-    logError(err);
-    console.log('');
+
+    if (err) {
+      console.log('');
+      logError(err);
+      console.log('');
+    }
+
+    yargsInstance.showHelp();
 
     process.exit(1);
   })

package/src/utils/callHandler.ts

@@ -92,7 +92,7 @@ export async function callHandler({
   metadataFilePath?: string;
 }) {
   const path = process.cwd();
-  const projectPath = `${path}/contracts/${dubheConfig.name}`;
+  const projectPath = `${path}/src/${dubheConfig.name}`;
 
   packageId = packageId || (await getOldPackageId(projectPath, network));
 

package/src/utils/publishHandler.ts

@@ -369,6 +369,8 @@ async function publishContract(
   let schemas = dubheConfig.schemas;
   let upgradeCapId = '';
 
+  let printObjects: any[] = [];
+
   result.objectChanges!.map((object: ObjectChange) => {
     if (object.type === 'published') {
       console.log(`  ├─ Package ID: ${object.packageId}`);
@@ -382,6 +384,9 @@ async function publishContract(
       console.log(`  ├─ Upgrade Cap: ${object.objectId}`);
       upgradeCapId = object.objectId || '';
     }
+    if (object.type === 'created') {
+      printObjects.push(object);
+    }
   });
 
   console.log(`  └─ Transaction: ${result.digest}`);
@@ -416,7 +421,7 @@ async function publishContract(
     console.log('  ├─ Hook execution successful');
     console.log(`  ├─ Transaction: ${deployHookResult.digest}`);
 
-    console.log('\n📋 Created Schemas:');
+    console.log('\n📋 Created Objects:');
     deployHookResult.objectChanges?.map((object: ObjectChange) => {
       if (
         object.type === 'created' &&
@@ -431,11 +436,15 @@ async function publishContract(
         object.objectType.includes('schema') &&
         !object.objectType.includes('dynamic_field')
       ) {
-        console.log(`  ├─ Type: ${object.objectType}`);
-        console.log(`  └─ ID: ${object.objectId}`);
+        printObjects.push(object);
       }
     });
 
+    printObjects.map((object: ObjectChange) => {
+      console.log(`  ├─ Type: ${object.objectType}`);
+      console.log(`  └─ ID: ${object.objectId}`);
+    });
+
     saveContractData(
       dubheConfig.name,
       network,
@@ -460,14 +469,14 @@ async function checkDubheFramework(projectPath: string): Promise<boolean> {
     console.log(chalk.yellow('\nℹ️ Dubhe Framework Files Not Found'));
     console.log(chalk.yellow('  ├─ Expected Path:'), projectPath);
     console.log(chalk.yellow('  ├─ To set up Dubhe Framework:'));
-    console.log(chalk.yellow('  │  1. Create directory: mkdir -p contracts/dubhe-framework'));
+    console.log(chalk.yellow('  │  1. Create directory: mkdir -p contracts/dubhe'));
     console.log(
       chalk.yellow(
-        '  │  2. Clone repository: git clone https://github.com/0xobelisk/dubhe-framework contracts/dubhe-framework'
+        '  │  2. Clone repository: git clone https://github.com/0xobelisk/dubhe contracts/dubhe'
       )
     );
     console.log(
-      chalk.yellow('  │  3. Or download from: https://github.com/0xobelisk/dubhe-framework')
+      chalk.yellow('  │  3. Or download from: https://github.com/0xobelisk/dubhe')
     );
     console.log(chalk.yellow('  └─ After setup, restart the local node'));
     return false;
@@ -480,7 +489,7 @@ export async function publishDubheFramework(
   network: 'mainnet' | 'testnet' | 'devnet' | 'localnet'
 ) {
   const path = process.cwd();
-  const projectPath = `${path}/contracts/dubhe-framework`;
+  const projectPath = `${path}/src/dubhe`;
 
   if (!(await checkDubheFramework(projectPath))) {
     return;
@@ -596,7 +605,7 @@ export async function publishDubheFramework(
     });
   }
 
-  saveContractData('dubhe-framework', network, packageId, schemaId, upgradeCapId, version, schemas);
+  saveContractData('dubhe', network, packageId, schemaId, upgradeCapId, version, schemas);
 
   updateEnvFile(`${projectPath}/Move.lock`, network, 'publish', chainId, packageId);
   await delay(1000);
@@ -618,7 +627,7 @@ export async function publishHandler(
   }
 
   const path = process.cwd();
-  const projectPath = `${path}/contracts/${dubheConfig.name}`;
+  const projectPath = `${path}/src/${dubheConfig.name}`;
   await updateDubheDependency(`${projectPath}/Move.toml`, network);
   await publishContract(dubhe, dubheConfig, network, projectPath, gasBudget);
 }

package/src/utils/queryStorage.ts

@@ -51,7 +51,7 @@ export async function queryStorage({
   metadataFilePath?: string;
 }) {
   const path = process.cwd();
-  const projectPath = `${path}/contracts/${dubheConfig.name}`;
+  const projectPath = `${path}/src/${dubheConfig.name}`;
 
   packageId = packageId || (await getOldPackageId(projectPath, network));
 

package/src/utils/startNode.ts

@@ -1,8 +1,8 @@
 import { execSync, spawn } from 'child_process';
 import chalk from 'chalk';
 import { printDubhe } from './printDubhe';
-import { existsSync, mkdirSync, appendFileSync } from 'fs';
-import { join } from 'path';
+import { delay, DubheCliError, validatePrivateKey } from '../utils';
+import { Dubhe } from '@0xobelisk/sui-client';
 
 function isSuiStartRunning(): boolean {
   try {
@@ -22,37 +22,39 @@ function isSuiStartRunning(): boolean {
 
 async function printAccounts() {
   // These private keys are used for testing purposes only, do not use them in production.
-  const accounts = [
-    { 
-      privateKey: 'suiprivkey1qq3ez3dje66l8pypgxynr7yymwps6uhn7vyczespj84974j3zya0wdpu76v', 
-      address: '0xe7f93ad7493035bcd674f287f78526091e195a6df9d64f23def61a7ce3adada9' 
-    },
-    { 
-      privateKey: 'suiprivkey1qp6vcyg8r2x88fllmjmxtpzjl95gd9dugqrgz7xxf50w6rqdqzetg7x4d7s', 
-      address: '0x492404a537c32b46610bd6ae9f7f16ba16ff5a607d272543fe86cada69d8cf44' 
-    },
-    { 
-      privateKey: 'suiprivkey1qpy3a696eh3m55fwa8h38ss063459u4n2dm9t24w2hlxxzjp2x34q8sdsnc', 
-      address: '0xd27e203483700d837a462d159ced6104619d8e36f737bf2a20c251153bf39f24' 
-    },
-    { 
-      privateKey: 'suiprivkey1qzxwp29favhzrjd95f6uj9nskjwal6nh9g509jpun395y6g72d6jqlmps4c', 
-      address: '0x018f1f175c9b6739a14bc9c81e7984c134ebf9031015cf796fefcef04b8c4990' 
-    },
-    { 
-      privateKey: 'suiprivkey1qzhq4lv38sesah4uzsqkkmeyjx860xqjdz8qgw36tmrdd5tnle3evxpng57', 
-      address: '0x932f6aab2bc636a25374f99794dc8451c4e27c91e87083e301816ed08bc98ed0' 
-    },
-    { 
-      privateKey: 'suiprivkey1qzez45sjjsepjgtksqvpq6jw7dzw3zq0dx7a4sulfypd73acaynw5jl9x2c', 
-      address: '0x9a66b2da3036badd22529e3de8a00b0cd7dbbfe589873aa03d5f885f5f8c6501' 
-    }
+  const privateKeys = [
+    'suiprivkey1qq3ez3dje66l8pypgxynr7yymwps6uhn7vyczespj84974j3zya0wdpu76v',
+    'suiprivkey1qp6vcyg8r2x88fllmjmxtpzjl95gd9dugqrgz7xxf50w6rqdqzetg7x4d7s',
+    'suiprivkey1qpy3a696eh3m55fwa8h38ss063459u4n2dm9t24w2hlxxzjp2x34q8sdsnc',
+    'suiprivkey1qzxwp29favhzrjd95f6uj9nskjwal6nh9g509jpun395y6g72d6jqlmps4c',
+    'suiprivkey1qzhq4lv38sesah4uzsqkkmeyjx860xqjdz8qgw36tmrdd5tnle3evxpng57',
+    'suiprivkey1qzez45sjjsepjgtksqvpq6jw7dzw3zq0dx7a4sulfypd73acaynw5jl9x2c'
   ];
   console.log('📝Accounts');
   console.log('==========');
-  accounts.forEach((account, index) => {
-    console.log(`  ┌─ Account #${index}: ${account.address}(100000 SUI)`);
-    console.log(`  └─ Private Key: ${account.privateKey}`);
+  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(
@@ -63,51 +65,6 @@ async function printAccounts() {
   );
 }
 
-async function setupDirectories() {
-  const nodeLogsDir = join(process.cwd(), 'node_logs');
-  const logsDir = join(nodeLogsDir, 'logs');
-  
-  if (!existsSync(nodeLogsDir)) {
-    mkdirSync(nodeLogsDir, { recursive: true });
-  }
-  
-  if (!existsSync(logsDir)) {
-    mkdirSync(logsDir, { recursive: true });
-  }
-  
-  return { nodeLogsDir, logsDir };
-}
-
-async function generateGenesisConfig(nodeLogsDir: string, logsDir: string) {
-  console.log('  ├─ Generating genesis configuration...');
-  execSync(`sui genesis --write-config ${join(nodeLogsDir, 'sui.yaml')}`);
-  
-  const additionalConfig = `
-  - address: "0xe7f93ad7493035bcd674f287f78526091e195a6df9d64f23def61a7ce3adada9"
-    gas_amounts:
-      - 100000000000000
-  - address: "0x492404a537c32b46610bd6ae9f7f16ba16ff5a607d272543fe86cada69d8cf44"
-    gas_amounts:
-      - 100000000000000
-  - address: "0xd27e203483700d837a462d159ced6104619d8e36f737bf2a20c251153bf39f24"
-    gas_amounts:
-      - 100000000000000
-  - address: "0x018f1f175c9b6739a14bc9c81e7984c134ebf9031015cf796fefcef04b8c4990"
-    gas_amounts:
-      - 100000000000000
-  - address: "0x932f6aab2bc636a25374f99794dc8451c4e27c91e87083e301816ed08bc98ed0"
-    gas_amounts:
-      - 100000000000000
-  - address: "0x9a66b2da3036badd22529e3de8a00b0cd7dbbfe589873aa03d5f885f5f8c6501"
-    gas_amounts:
-      - 100000000000000
-`;
-  appendFileSync(join(nodeLogsDir, 'sui.yaml'), additionalConfig);
-  
-  console.log('  ├─ Initializing genesis...');
-  execSync(`sui genesis --working-dir ${logsDir} -f --from-config ${join(nodeLogsDir, 'sui.yaml')}`);
-}
-
 function handleProcessSignals(suiProcess: ReturnType<typeof spawn> | null) {
   const cleanup = () => {
     console.log(chalk.yellow('\n🔔 Stopping Local Node...'));
@@ -121,7 +78,7 @@ function handleProcessSignals(suiProcess: ReturnType<typeof spawn> | null) {
   process.on('SIGTERM', cleanup);
 }
 
-export async function startLocalNode(options: { forceRegenesis?: boolean } = {}) {
+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'));
@@ -131,34 +88,35 @@ export async function startLocalNode(options: { forceRegenesis?: boolean } = {})
 
   printDubhe();
   console.log('🚀 Starting Local Node...');
-  
   let suiProcess: ReturnType<typeof spawn> | null = null;
-
   try {
-    const { nodeLogsDir, logsDir } = await setupDirectories();
+    suiProcess = spawn('sui', ['start', '--with-faucet', '--force-regenesis'], {
+      env: { ...process.env, RUST_LOG: 'off,sui_node=info' },
+      stdio: 'ignore'
+    });
 
-    if (options.forceRegenesis) {
-      console.log('  ├─ Force Regenesis: Yes');
-      await generateGenesisConfig(nodeLogsDir, logsDir);
-    } else {
-      console.log('  ├─ Force Regenesis: No');
-    }
-    
+    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();
-    console.log(chalk.green('🎉 Local environment is ready!'));
 
-    suiProcess = spawn('sui', [
-      'start',
-      '--with-faucet',
-      '--network.config',
-      join(logsDir, 'network.yaml')
-    ], {
-      env: { ...process.env, RUST_LOG: 'off,sui_node=info' },
-      stdio: 'ignore'
-    });
+    await delay(2000);
+
+    const privateKeyFormat = validatePrivateKey(
+      'suiprivkey1qzez45sjjsepjgtksqvpq6jw7dzw3zq0dx7a4sulfypd73acaynw5jl9x2c'
+    );
+    if (privateKeyFormat === false) {
+      throw new DubheCliError(`Please check your privateKey.`);
+    }
+
+    console.log(chalk.green('🎉 Local environment is ready!'));
 
     handleProcessSignals(suiProcess);
 
@@ -173,4 +131,4 @@ export async function startLocalNode(options: { forceRegenesis?: boolean } = {})
     }
     process.exit(1);
   }
-}
+}

package/src/utils/storeConfig.ts

@@ -40,7 +40,7 @@ export async function storeConfigHandler(
   outputPath: string
 ) {
   const path = process.cwd();
-  const contractPath = `${path}/contracts/${dubheConfig.name}`;
+  const contractPath = `${path}/src/${dubheConfig.name}`;
   const deployment = await getDeploymentJson(contractPath, network);
   await storeConfig(deployment.network, deployment.packageId, deployment.schemaId, outputPath);
 }

package/src/utils/upgradeHandler.ts

@@ -10,6 +10,7 @@ import {
   getOnchainSchemas,
   switchEnv,
   getSchemaId,
+  getDubheSchemaId,
   initializeDubhe
 } from './utils';
 import * as fs from 'fs';
@@ -96,7 +97,7 @@ export async function upgradeHandler(
   await switchEnv(network);
 
   const path = process.cwd();
-  const projectPath = `${path}/contracts/${name}`;
+  const projectPath = `${path}/src/${name}`;
 
   const dubhe = initializeDubhe({
     network
@@ -131,7 +132,7 @@ export async function upgradeHandler(
         dependencies: extractedDependencies,
         digest: extractedDigest
       } = JSON.parse(
-        execSync(`sui move build --dump-bytecode-as-base64 --path ${path}/contracts/${name}`, {
+        execSync(`sui move build --dump-bytecode-as-base64 --path ${path}/src/${name}`, {
           encoding: 'utf-8'
         })
       );
@@ -219,7 +220,7 @@ export async function upgradeHandler(
     const newVersion = oldVersion + 1;
     let args = [];
     if (name !== 'dubhe') {
-      let dubheSchemaId = await getSchemaId(`${process.cwd()}/contracts/dubhe-framework`, network);
+      let dubheSchemaId = await getDubheSchemaId(network);
       args.push(migrateTx.object(dubheSchemaId));
     }
     args.push(migrateTx.object(schemaId));