@0xobelisk/sui-cli 1.2.0-pre.3 → 1.2.0-pre.33

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/loadMetadata.ts

@@ -0,0 +1,50 @@
+import type { CommandModule } from 'yargs';
+import { logError } from '../utils/errors';
+import { loadConfig, DubheConfig } from '@0xobelisk/sui-common';
+import { loadMetadataHandler } from '../utils/metadataHandler';
+
+type Options = {
+  network: any;
+  'config-path': string;
+  'package-id'?: string;
+};
+
+const commandModule: CommandModule<Options, Options> = {
+  command: 'load-metadata',
+
+  describe: 'Load metadata for a package',
+
+  builder(yargs) {
+    return yargs.options({
+      network: {
+        type: 'string',
+        choices: ['mainnet', 'testnet', 'devnet', 'localnet'],
+        default: 'localnet',
+        desc: 'Node network (mainnet/testnet/devnet/localnet)'
+      },
+      'config-path': {
+        type: 'string',
+        desc: 'Configuration file path',
+        default: 'dubhe.config.ts'
+      },
+      'package-id': {
+        type: 'string',
+        desc: 'Package ID to load metadata for',
+        optional: true
+      }
+    });
+  },
+
+  async handler({ network, 'config-path': configPath, 'package-id': packageId }) {
+    try {
+      const dubheConfig = (await loadConfig(configPath)) as DubheConfig;
+      await loadMetadataHandler(dubheConfig, network, packageId);
+    } catch (error: any) {
+      logError(error);
+      process.exit(1);
+    }
+    process.exit(0);
+  }
+};
+
+export default commandModule;

package/src/commands/localnode.ts

@@ -1,24 +1,32 @@
 import type { CommandModule } from 'yargs';
 import { startLocalNode } from '../utils/startNode';
 
-const commandModule: CommandModule = {
+type Options = {
+  'data-dir': string;
+  force: boolean;
+};
+
+const commandModule: CommandModule<Options, Options> = {
   command: 'node',
 
   describe: 'Manage local Sui node',
 
-  builder(yargs) {
-    return yargs
-      .option('force-regenesis', {
-        alias: 'f',
-        type: 'boolean',
-        description: 'Force regenesis the local node',
-        default: true
-      });
+  builder: {
+    'data-dir': {
+      type: 'string',
+      default: '.chk',
+      desc: 'Path to the data directory'
+    },
+    force: {
+      type: 'boolean',
+      default: false,
+      desc: 'Force restart: stop existing node and remove data directory'
+    }
   },
 
-  async handler(argv) {
+  async handler({ 'data-dir': data_dir, force }) {
     try {
-      await startLocalNode({ forceRegenesis: argv['force-regenesis'] as boolean });
+      await startLocalNode(data_dir, force);
     } catch (error) {
       console.error('Error executing command:', error);
       process.exit(1);

package/src/commands/publish.ts

@@ -2,6 +2,7 @@ import type { CommandModule } from 'yargs';
 import { logError } from '../utils/errors';
 import { publishHandler } from '../utils';
 import { loadConfig, DubheConfig } from '@0xobelisk/sui-common';
+import { execSync } from 'child_process';
 
 type Options = {
   network: any;
@@ -38,7 +39,8 @@ const commandModule: CommandModule<Options, Options> = {
   async handler({ network, 'config-path': configPath, 'gas-budget': gasBudget }) {
     try {
       const dubheConfig = (await loadConfig(configPath)) as DubheConfig;
-      await publishHandler(dubheConfig, network, gasBudget);
+      execSync(`pnpm dubhe convert-json --config-path ${configPath}`, { encoding: 'utf-8' })
+      await publishHandler(dubheConfig, network, gasBudget); 
     } catch (error: any) {
       logError(error);
       process.exit(1);

package/src/commands/query.ts

@@ -1,108 +1,108 @@
-import type { CommandModule } from 'yargs';
-import { logError } from '../utils/errors';
-import { queryStorage } from '../utils';
-import { loadConfig, DubheConfig } from '@0xobelisk/sui-common';
+// import type { CommandModule } from 'yargs';
+// import { logError } from '../utils/errors';
+// import { queryStorage } from '../utils';
+// import { loadConfig, DubheConfig } from '@0xobelisk/sui-common';
 
-type Options = {
-  network: 'mainnet' | 'testnet' | 'devnet' | 'localnet';
-  'config-path'?: string;
-  schema: string;
-  'object-id'?: string;
-  'package-id'?: string;
-  'metadata-path'?: string;
-  params?: any[];
-};
+// type Options = {
+//   network: 'mainnet' | 'testnet' | 'devnet' | 'localnet';
+//   'config-path'?: string;
+//   schema: string;
+//   'object-id'?: string;
+//   'package-id'?: string;
+//   'metadata-path'?: string;
+//   params?: any[];
+// };
 
-/**
- * CLI command module for querying schema struct state
- *
- * Examples:
- *
- * 1. Query StorageValue (no params required):
- * ```bash
- * dubhe query --config-path dubhe.config.ts --network devnet --schema counter --field value
- * ```
- *
- * 2. Query StorageMap (one param required):
- * ```bash
- * dubhe query --config-path dubhe.config.ts --network devnet --schema token --field balances \
- *   --params "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef"
- * ```
- *
- * 3. Query StorageDoubleMap (two params required):
- * ```bash
- * dubhe query --config-path dubhe.config.ts --network devnet --schema game --field player_relations \
- *   --params "0x123...456" "0x789...abc"
- * ```
- */
-const commandModule: CommandModule<Options, Options> = {
-  command: 'query',
+// /**
+//  * CLI command module for querying schema struct state
+//  *
+//  * Examples:
+//  *
+//  * 1. Query StorageValue (no params required):
+//  * ```bash
+//  * dubhe query --config-path dubhe.config.ts --network devnet --schema counter --field value
+//  * ```
+//  *
+//  * 2. Query StorageMap (one param required):
+//  * ```bash
+//  * dubhe query --config-path dubhe.config.ts --network devnet --schema token --field balances \
+//  *   --params "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef"
+//  * ```
+//  *
+//  * 3. Query StorageDoubleMap (two params required):
+//  * ```bash
+//  * dubhe query --config-path dubhe.config.ts --network devnet --schema game --field player_relations \
+//  *   --params "0x123...456" "0x789...abc"
+//  * ```
+//  */
+// const commandModule: CommandModule<Options, Options> = {
+//   command: 'query',
 
-  describe: 'Query dubhe schema struct state',
+//   describe: 'Query dubhe schema struct state',
 
-  builder: {
-    network: {
-      type: 'string',
-      choices: ['mainnet', 'testnet', 'devnet', 'localnet'],
-      default: 'localnet',
-      desc: 'Node network (mainnet/testnet/devnet/localnet)'
-    },
-    'config-path': {
-      type: 'string',
-      default: 'dubhe.config.ts',
-      desc: 'Configuration file path'
-    },
-    schema: {
-      type: 'string',
-      desc: 'Schema name',
-      demandOption: true
-    },
-    'object-id': {
-      type: 'string',
-      desc: 'Object ID (optional)'
-    },
-    'package-id': {
-      type: 'string',
-      desc: 'Package ID (optional)'
-    },
-    'metadata-path': {
-      type: 'string',
-      desc: 'Path to metadata JSON file (optional)'
-    },
-    params: {
-      type: 'array',
-      desc: 'Params for storage type: StorageValue(no params), StorageMap(1 param), StorageDoubleMap(2 params)',
-      string: true
-    }
-  },
+//   builder: {
+//     network: {
+//       type: 'string',
+//       choices: ['mainnet', 'testnet', 'devnet', 'localnet'],
+//       default: 'localnet',
+//       desc: 'Node network (mainnet/testnet/devnet/localnet)'
+//     },
+//     'config-path': {
+//       type: 'string',
+//       default: 'dubhe.config.ts',
+//       desc: 'Configuration file path'
+//     },
+//     schema: {
+//       type: 'string',
+//       desc: 'Schema name',
+//       demandOption: true
+//     },
+//     'object-id': {
+//       type: 'string',
+//       desc: 'Object ID (optional)'
+//     },
+//     'package-id': {
+//       type: 'string',
+//       desc: 'Package ID (optional)'
+//     },
+//     'metadata-path': {
+//       type: 'string',
+//       desc: 'Path to metadata JSON file (optional)'
+//     },
+//     params: {
+//       type: 'array',
+//       desc: 'Params for storage type: StorageValue(no params), StorageMap(1 param), StorageDoubleMap(2 params)',
+//       string: true
+//     }
+//   },
 
-  async handler({
-    network,
-    'config-path': configPath,
-    schema,
-    'object-id': objectId,
-    'package-id': packageId,
-    'metadata-path': metadataPath,
-    params
-  }) {
-    try {
-      const dubheConfig = (await loadConfig(configPath)) as DubheConfig;
+//   async handler({
+//     network,
+//     'config-path': configPath,
+//     schema,
+//     'object-id': objectId,
+//     'package-id': packageId,
+//     'metadata-path': metadataPath,
+//     params
+//   }) {
+//     try {
+//       const dubheConfig = (await loadConfig(configPath)) as DubheConfig;
 
-      await queryStorage({
-        dubheConfig,
-        schema,
-        objectId,
-        network,
-        packageId,
-        metadataFilePath: metadataPath,
-        params
-      });
-    } catch (error: any) {
-      logError(error);
-      process.exit(1);
-    }
-    process.exit(0);
-  }
-};
+//       await queryStorage({
+//         dubheConfig,
+//         schema,
+//         objectId,
+//         network,
+//         packageId,
+//         metadataFilePath: metadataPath,
+//         params
+//       });
+//     } catch (error: any) {
+//       logError(error);
+//       process.exit(1);
+//     }
+//     process.exit(0);
+//   }
+// };
 
-export default commandModule;
+// export default commandModule;

package/src/commands/schemagen.ts

@@ -1,6 +1,7 @@
 import type { CommandModule } from 'yargs';
 import { schemaGen, loadConfig, DubheConfig } from '@0xobelisk/sui-common';
 import chalk from 'chalk';
+import path from "node:path";
 
 type Options = {
   'config-path'?: string;
@@ -27,8 +28,10 @@ const commandModule: CommandModule<Options, Options> = {
 
   async handler({ 'config-path': configPath, network }) {
     try {
+      if (!configPath) throw new Error('Config path is required');
       const dubheConfig = (await loadConfig(configPath)) as DubheConfig;
-      await schemaGen(dubheConfig, undefined, network);
+      const rootDir = path.dirname(configPath);
+      await schemaGen(rootDir, dubheConfig, network);
       process.exit(0);
     } catch (error: any) {
       console.log(chalk.red('Schemagen failed!'));

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/commands/upgrade.ts

@@ -1,44 +1,44 @@
-import type { CommandModule } from 'yargs';
-import { logError } from '../utils/errors';
-import { upgradeHandler } from '../utils/upgradeHandler';
-import { DubheConfig, loadConfig } from '@0xobelisk/sui-common';
+// import type { CommandModule } from 'yargs';
+// import { logError } from '../utils/errors';
+// import { upgradeHandler } from '../utils/upgradeHandler';
+// import { DubheConfig, loadConfig } from '@0xobelisk/sui-common';
 
-type Options = {
-  network: any;
-  'config-path': string;
-};
+// type Options = {
+//   network: any;
+//   'config-path': string;
+// };
 
-const commandModule: CommandModule<Options, Options> = {
-  command: 'upgrade',
+// const commandModule: CommandModule<Options, Options> = {
+//   command: 'upgrade',
 
-  describe: 'Upgrade your move contracts',
+//   describe: 'Upgrade your move contracts',
 
-  builder(yargs) {
-    return yargs.options({
-      network: {
-        type: 'string',
-        choices: ['mainnet', 'testnet', 'devnet', 'localnet'],
-        default: 'localnet',
-        desc: 'Network of the node (mainnet/testnet/devnet/localnet)'
-      },
-      'config-path': {
-        type: 'string',
-        default: 'dubhe.config.ts',
-        decs: 'Path to the config file'
-      }
-    });
-  },
+//   builder(yargs) {
+//     return yargs.options({
+//       network: {
+//         type: 'string',
+//         choices: ['mainnet', 'testnet', 'devnet', 'localnet'],
+//         default: 'localnet',
+//         desc: 'Network of the node (mainnet/testnet/devnet/localnet)'
+//       },
+//       'config-path': {
+//         type: 'string',
+//         default: 'dubhe.config.ts',
+//         decs: 'Path to the config file'
+//       }
+//     });
+//   },
 
-  async handler({ network, 'config-path': configPath }) {
-    try {
-      const dubheConfig = (await loadConfig(configPath)) as DubheConfig;
-      await upgradeHandler(dubheConfig, dubheConfig.name, network);
-    } catch (error: any) {
-      logError(error);
-      process.exit(1);
-    }
-    process.exit(0);
-  }
-};
+//   async handler({ network, 'config-path': configPath }) {
+//     try {
+//       const dubheConfig = (await loadConfig(configPath)) as DubheConfig;
+//       await upgradeHandler(dubheConfig, dubheConfig.name, network);
+//     } catch (error: any) {
+//       logError(error);
+//       process.exit(1);
+//     }
+//     process.exit(0);
+//   }
+// };
 
-export default commandModule;
+// export default commandModule;

package/src/dubhe.ts

@@ -2,12 +2,13 @@
 
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
+import chalk from 'chalk';
 import { commands } from './commands';
 import { logError } from './utils/errors';
+import packageJson from '../package.json';
 
 // Load .env file into process.env
 import * as dotenv from 'dotenv';
-import chalk from 'chalk';
 dotenv.config();
 
 yargs(hideBin(process.argv))
@@ -16,11 +17,15 @@ 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)
+  .version(packageJson.version)
+  .demandCommand(1, 'Please provide a command')
+  .recommendCommands()
   // Enable strict mode.
   .strict()
   // Custom error handler
   .fail((msg, err) => {
     console.error(chalk.red(msg));
+
     if (msg.includes('Missing required argument')) {
       console.log(
         chalk.yellow(
@@ -29,8 +34,11 @@ yargs(hideBin(process.argv))
       );
     }
     console.log('');
-    logError(err);
-    console.log('');
+    // Even though `.fail` type says we should get an `Error`, this can sometimes be undefined
+    if (err != null) {
+      logError(err);
+      console.log('');
+    }
 
     process.exit(1);
   })