@0xobelisk/sui-cli 1.2.0-pre.4 → 1.2.0-pre.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xobelisk/sui-cli",
-  "version": "1.2.0-pre.4",
+  "version": "1.2.0-pre.41",
   "description": "Tookit for interacting with move eps framework",
   "keywords": [
     "sui",
@@ -37,10 +37,13 @@
     "chalk": "^5.0.1",
     "child_process": "^1.0.2",
     "chokidar": "^3.5.3",
+    "cli-progress": "^3.12.0",
+    "cli-table3": "^0.6.5",
     "dotenv": "^16.0.3",
     "ejs": "^3.1.8",
     "execa": "^7.0.0",
     "glob": "^8.0.3",
+    "inquirer": "^9.2.15",
     "ora": "^5.4.1",
     "path": "^0.12.7",
     "sqlite": "^5.1.1",
@@ -50,12 +53,14 @@
     "yargs": "^17.7.1",
     "zod": "^3.22.3",
     "zod-validation-error": "^1.3.0",
-    "@0xobelisk/sui-client": "1.2.0-pre.4",
-    "@0xobelisk/sui-common": "1.2.0-pre.4"
+    "@0xobelisk/sui-client": "1.2.0-pre.41",
+    "@0xobelisk/sui-common": "1.2.0-pre.41"
   },
   "devDependencies": {
+    "@types/cli-progress": "^3.11.5",
     "@types/ejs": "^3.1.1",
     "@types/glob": "^7.2.0",
+    "@types/inquirer": "^9.0.7",
     "@types/node": "^18.15.11",
     "@types/yargs": "^17.0.10",
     "eslint": "^8.56.0",

package/src/commands/build.ts

@@ -1,5 +1,5 @@
 import type { CommandModule } from 'yargs';
-import { execSync } from 'child_process';
+import { execSync, exec } from 'child_process';
 import chalk from 'chalk';
 import { DubheConfig, loadConfig } from '@0xobelisk/sui-common';
 import { switchEnv, updateDubheDependency } from '../utils';
@@ -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} ${
@@ -52,6 +52,7 @@ const commandModule: CommandModule<Options, Options> = {
       }`;
       const output = execSync(command, { encoding: 'utf-8' });
       console.log(output);
+      exec(`pnpm dubhe convert-json --config-path ${configPath}`)
     } catch (error: any) {
       console.error(chalk.red('Error executing sui move build:'));
       console.log(error.stdout);

package/src/commands/call.ts

@@ -1,90 +1,90 @@
-import type { CommandModule } from 'yargs';
-import { logError } from '../utils/errors';
-import { callHandler } from '../utils';
-import { loadConfig, DubheConfig } from '@0xobelisk/sui-common';
+// import type { CommandModule } from 'yargs';
+// import { logError } from '../utils/errors';
+// import { callHandler } from '../utils';
+// import { loadConfig, DubheConfig } from '@0xobelisk/sui-common';
 
-type Options = {
-  network: 'mainnet' | 'testnet' | 'devnet' | 'localnet';
-  module: string;
-  function: string;
-  'config-path'?: string;
-  'package-id'?: string;
-  'metadata-path'?: string;
-  params?: any[];
-};
+// type Options = {
+//   network: 'mainnet' | 'testnet' | 'devnet' | 'localnet';
+//   module: string;
+//   function: string;
+//   'config-path'?: string;
+//   'package-id'?: string;
+//   'metadata-path'?: string;
+//   params?: any[];
+// };
 
-/**
- * CLI command for calling a function in a module
- */
-const commandModule: CommandModule<Options, Options> = {
-  command: 'call',
+// /**
+//  * CLI command for calling a function in a module
+//  */
+// const commandModule: CommandModule<Options, Options> = {
+//   command: 'call',
 
-  describe: 'Call a function in a module',
+//   describe: 'Call a function in a module',
 
-  builder: {
-    network: {
-      type: 'string',
-      choices: ['mainnet', 'testnet', 'devnet', 'localnet'],
-      desc: 'Node network (mainnet/testnet/devnet/localnet)',
-      default: 'localnet'
-    },
-    module: {
-      type: 'string',
-      desc: 'Module name',
-      demandOption: true
-    },
-    function: {
-      type: 'string',
-      desc: 'Function name',
-      demandOption: true
-    },
-    'config-path': {
-      type: 'string',
-      default: 'dubhe.config.ts',
-      desc: 'Configuration file path'
-    },
-    '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 the function',
-      string: true
-    }
-  },
+//   builder: {
+//     network: {
+//       type: 'string',
+//       choices: ['mainnet', 'testnet', 'devnet', 'localnet'],
+//       desc: 'Node network (mainnet/testnet/devnet/localnet)',
+//       default: 'localnet'
+//     },
+//     module: {
+//       type: 'string',
+//       desc: 'Module name',
+//       demandOption: true
+//     },
+//     function: {
+//       type: 'string',
+//       desc: 'Function name',
+//       demandOption: true
+//     },
+//     'config-path': {
+//       type: 'string',
+//       default: 'dubhe.config.ts',
+//       desc: 'Configuration file path'
+//     },
+//     '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 the function',
+//       string: true
+//     }
+//   },
 
-  async handler({
-    network,
-    'config-path': configPath,
-    module: moduleName,
-    function: funcName,
-    'package-id': packageId,
-    'metadata-path': metadataPath,
-    params
-  }) {
-    try {
-      const dubheConfig = (await loadConfig(configPath)) as DubheConfig;
+//   async handler({
+//     network,
+//     'config-path': configPath,
+//     module: moduleName,
+//     function: funcName,
+//     'package-id': packageId,
+//     'metadata-path': metadataPath,
+//     params
+//   }) {
+//     try {
+//       const dubheConfig = (await loadConfig(configPath)) as DubheConfig;
 
-      await callHandler({
-        dubheConfig,
-        moduleName,
-        funcName,
-        network,
-        packageId,
-        metadataFilePath: metadataPath,
-        params
-      });
-    } catch (error: any) {
-      logError(error);
-      process.exit(1);
-    }
-    process.exit(0);
-  }
-};
+//       await callHandler({
+//         dubheConfig,
+//         moduleName,
+//         funcName,
+//         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/convertJson.ts

@@ -0,0 +1,49 @@
+import type { CommandModule } from 'yargs';
+import chalk from 'chalk';
+import { DubheConfig, loadConfig } from '@0xobelisk/sui-common';
+import { generateConfigJson } from '../utils';
+import fs from 'fs';
+
+type Options = {
+  'config-path': string;
+  'output-path': string;
+};
+
+const commandModule: CommandModule<Options, Options> = {
+  command: 'convert-json',
+  describe: 'Convert JSON from Dubhe config to config.json',
+  builder(yargs) {
+    return yargs.options({
+      'config-path': {
+        type: 'string',
+        default: 'dubhe.config.ts',
+        description: 'Options to pass to forge test'
+      },
+      'output-path': {
+        type: 'string',
+        default: 'dubhe.config.json',
+        description: 'Output path for the config.json file'
+      }
+    });
+  },
+
+  async handler({
+    'config-path': configPath,
+    'output-path': outputPath
+  }) {
+    // Start an internal anvil process if no world address is provided
+    try {
+      console.log('🚀 Running convert json');
+      const dubheConfig = (await loadConfig(configPath)) as DubheConfig;
+      const json = generateConfigJson(dubheConfig);
+      // write to file
+      fs.writeFileSync(outputPath, json);
+    } catch (error: any) {
+      console.error(chalk.red('Error executing convert json:'));
+      console.log(error.stdout);
+      process.exit(0);
+    }
+  }
+};
+
+export default commandModule;