@0xobelisk/sui-cli 1.0.7 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xobelisk/sui-cli",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Tookit for interacting with move eps framework",
   "keywords": [
     "sui",
@@ -31,7 +31,7 @@
     "dubhe": "./dist/dubhe.js"
   },
   "dependencies": {
-    "@mysten/sui": "^1.7.0",
+    "@mysten/sui": "^1.19.0",
     "chalk": "^5.0.1",
     "child_process": "^1.0.2",
     "dotenv": "^16.0.3",
@@ -45,8 +45,11 @@
     "yargs": "^17.7.1",
     "zod": "^3.22.3",
     "zod-validation-error": "^1.3.0",
-    "@0xobelisk/sui-common": "1.0.3",
-    "@0xobelisk/sui-client": "1.0.3"
+    "@types/sqlite3": "^3.1.11",
+    "sqlite": "^5.1.1",
+    "sqlite3": "^5.1.7",
+    "@0xobelisk/sui-common": "1.0.4",
+    "@0xobelisk/sui-client": "1.0.4"
   },
   "devDependencies": {
     "@types/ejs": "^3.1.1",
@@ -59,11 +62,12 @@
     "vitest": "0.31.4"
   },
   "scripts": {
-    "build": "pnpm run build:js",
+    "build": "pnpm run type-check && pnpm run build:js",
     "build:js": "tsup && chmod +x ./dist/dubhe.js",
     "clean": "pnpm run clean:js",
     "clean:js": "rimraf dist",
     "dev": "tsup --watch",
-    "lint": "eslint . --ext .ts"
+    "lint": "eslint . --ext .ts",
+    "type-check": "tsc --noEmit"
   }
 }

package/src/commands/build.ts

@@ -1,56 +1,62 @@
-import type { CommandModule } from "yargs";
-import { execSync } from "child_process";
-import chalk from "chalk";
+import type { CommandModule } from 'yargs';
+import { execSync } from 'child_process';
+import chalk from 'chalk';
 import { DubheConfig, loadConfig } from '@0xobelisk/sui-common';
 import { switchEnv, updateDubheDependency } from '../utils';
 
 type Options = {
-  'config-path': string;
-   network: any;
-  'dump-bytecode-as-base64'?: boolean;
+	'config-path': string;
+	network: any;
+	'dump-bytecode-as-base64'?: boolean;
 };
 
 const commandModule: CommandModule<Options, Options> = {
-  command: "build",
-  describe: "Run tests in Dubhe contracts",
-  builder(yargs) {
-    return yargs.options({
-      'config-path': {
-        type: "string",
-        default: "dubhe.config.ts",
-        description: "Options to pass to forge test",
-      },
-      network: {
-        type: 'string',
-        choices: ['mainnet', 'testnet', 'devnet', 'localnet'],
-        desc: 'Node network (mainnet/testnet/devnet/localnet)',
-      },
-      'dump-bytecode-as-base64': {
-        type: 'boolean',
-        default: false,
-        desc: 'Dump bytecode as base64',
-      },
-    });
-  },
+	command: 'build',
+	describe: 'Run tests in Dubhe contracts',
+	builder(yargs) {
+		return yargs.options({
+			'config-path': {
+				type: 'string',
+				default: 'dubhe.config.ts',
+				description: 'Options to pass to forge test',
+			},
+			network: {
+				type: 'string',
+				choices: ['mainnet', 'testnet', 'devnet', 'localnet'],
+				desc: 'Node network (mainnet/testnet/devnet/localnet)',
+			},
+			'dump-bytecode-as-base64': {
+				type: 'boolean',
+				default: false,
+				desc: 'Dump bytecode as base64',
+			},
+		});
+	},
 
-  async handler({ 'config-path': configPath, network, 'dump-bytecode-as-base64': dumpBytecodeAsBase64 }) {
-    // Start an internal anvil process if no world address is provided
-    try {
-      console.log('🚀 Running move build');
-      const dubheConfig = (await loadConfig(configPath)) as DubheConfig;
-      const path = process.cwd();
-      const projectPath = `${path}/contracts/${dubheConfig.name}`;
-      await switchEnv(network);
-      updateDubheDependency(projectPath+'/Move.toml', network);
-      const command = `sui move build --path ${projectPath} ${dumpBytecodeAsBase64 ? ` --dump-bytecode-as-base64` : ''}`;
-      const output = execSync(command, { encoding: "utf-8" });
-      console.log(output);
-    } catch (error: any) {
-      console.error(chalk.red("Error executing sui move build:"));
-      console.log(error.stdout);
-      process.exit(0);
-    }
-  },
+	async handler({
+		'config-path': configPath,
+		network,
+		'dump-bytecode-as-base64': dumpBytecodeAsBase64,
+	}) {
+		// Start an internal anvil process if no world address is provided
+		try {
+			console.log('🚀 Running move build');
+			const dubheConfig = (await loadConfig(configPath)) as DubheConfig;
+			const path = process.cwd();
+			const projectPath = `${path}/contracts/${dubheConfig.name}`;
+			await switchEnv(network);
+			await updateDubheDependency(projectPath + '/Move.toml', network);
+			const command = `sui move build --path ${projectPath} ${
+				dumpBytecodeAsBase64 ? ` --dump-bytecode-as-base64` : ''
+			}`;
+			const output = execSync(command, { encoding: 'utf-8' });
+			console.log(output);
+		} catch (error: any) {
+			console.error(chalk.red('Error executing sui move build:'));
+			console.log(error.stdout);
+			process.exit(0);
+		}
+	},
 };
 
 export default commandModule;

package/src/commands/call.ts

@@ -26,7 +26,7 @@ const commandModule: CommandModule<Options, Options> = {
 			type: 'string',
 			choices: ['mainnet', 'testnet', 'devnet', 'localnet'],
 			desc: 'Node network (mainnet/testnet/devnet/localnet)',
-			demandOption: true,
+			default: 'localnet',
 		},
 		module: {
 			type: 'string',

package/src/commands/checkBalance.ts

@@ -13,6 +13,7 @@ const commandModule: CommandModule<Options, Options> = {
 			type: 'string',
 			choices: ['mainnet', 'testnet', 'devnet', 'localnet'],
 			desc: 'Network to check balance on',
+			default: 'localnet',
 		},
 	},
 	async handler({ network }) {

package/src/commands/faucet.ts

@@ -51,8 +51,7 @@ const commandModule: CommandModule<Options, Options> = {
 			const dubhe = new Dubhe({
 				secretKey: privateKeyFormat,
 			});
-			const keypair = dubhe.getKeypair();
-			faucet_address = keypair.toSuiAddress();
+			faucet_address = dubhe.getAddress();
 		} else {
 			faucet_address = recipient;
 		}

package/src/commands/index.ts

@@ -13,6 +13,7 @@ import checkBalance from './checkBalance';
 import configStore from './configStore';
 import query from './query';
 import call from './call';
+import indexer from './indexer';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any -- Each command has different options
 export const commands: CommandModule<any, any>[] = [
@@ -29,4 +30,5 @@ export const commands: CommandModule<any, any>[] = [
 	generateKey,
 	checkBalance,
 	configStore,
+	indexer,
 ];

package/src/commands/indexer.ts

@@ -0,0 +1,61 @@
+import type { CommandModule } from 'yargs';
+import { logError } from '../utils/errors';
+import { indexerHandler } from '../utils';
+import { loadConfig, DubheConfig } from '@0xobelisk/sui-common';
+
+type Options = {
+	network: any;
+	'config-path': string;
+	'db': string;
+	'schemaId'?: string;
+};
+
+const commandModule: CommandModule<Options, Options> = {
+	command: 'indexer',
+
+	describe: 'Dubhe indexer',
+
+	builder(yargs) {
+		return yargs.options({
+			network: {
+				type: 'string',
+				choices: ['mainnet', 'testnet', 'devnet', 'localnet'],
+				desc: 'Node network (mainnet/testnet/devnet/localnet)',
+				default: 'localnet',
+			},
+			'config-path': {
+				type: 'string',
+				default: 'dubhe.config.ts',
+				desc: 'Configuration file path',
+			},
+			'schemaId': {
+				type: 'string',
+				desc: 'Schema ID',
+			},
+			'db': {
+				type: 'string',
+				choices: ['sqlite', 'postgres'],
+				desc: 'Optional gas budget for the transaction',
+				default: 'sqlite',
+			},
+		});
+	},
+
+	async handler({
+		network,
+		'config-path': configPath,
+		db,
+		schemaId: schemaId,
+	}) {
+		try {
+			const dubheConfig = (await loadConfig(configPath)) as DubheConfig;
+			await indexerHandler(dubheConfig, network, db, schemaId);
+		} catch (error: any) {
+			logError(error);
+			process.exit(1);
+		}
+		process.exit(0);
+	},
+};
+
+export default commandModule;

package/src/commands/publish.ts

@@ -19,6 +19,7 @@ const commandModule: CommandModule<Options, Options> = {
 			network: {
 				type: 'string',
 				choices: ['mainnet', 'testnet', 'devnet', 'localnet'],
+				default: 'localnet',
 				desc: 'Node network (mainnet/testnet/devnet/localnet)',
 			},
 			'config-path': {

package/src/commands/query.ts

@@ -7,7 +7,6 @@ type Options = {
 	network: 'mainnet' | 'testnet' | 'devnet' | 'localnet';
 	'config-path'?: string;
 	schema: string;
-	field: string;
 	'object-id'?: string;
 	'package-id'?: string;
 	'metadata-path'?: string;
@@ -45,8 +44,8 @@ const commandModule: CommandModule<Options, Options> = {
 		network: {
 			type: 'string',
 			choices: ['mainnet', 'testnet', 'devnet', 'localnet'],
+			default: 'localnet',
 			desc: 'Node network (mainnet/testnet/devnet/localnet)',
-			demandOption: true,
 		},
 		'config-path': {
 			type: 'string',
@@ -58,11 +57,6 @@ const commandModule: CommandModule<Options, Options> = {
 			desc: 'Schema name',
 			demandOption: true,
 		},
-		field: {
-			type: 'string',
-			desc: 'Field name',
-			demandOption: true,
-		},
 		'object-id': {
 			type: 'string',
 			desc: 'Object ID (optional)',
@@ -86,7 +80,6 @@ const commandModule: CommandModule<Options, Options> = {
 		network,
 		'config-path': configPath,
 		schema,
-		field,
 		'object-id': objectId,
 		'package-id': packageId,
 		'metadata-path': metadataPath,
@@ -98,7 +91,6 @@ const commandModule: CommandModule<Options, Options> = {
 			await queryStorage({
 				dubheConfig,
 				schema,
-				field,
 				objectId,
 				network,
 				packageId,

package/src/commands/test.ts

@@ -1,50 +1,51 @@
-import type { CommandModule } from "yargs";
-import { execSync } from "child_process";
-import chalk from "chalk";
+import type { CommandModule } from 'yargs';
+import { execSync } from 'child_process';
 import { DubheConfig, loadConfig } from '@0xobelisk/sui-common';
 
 type Options = {
-  'config-path': string;
-  'test'?: string;
-  'gas-limit'?: string;
+	'config-path': string;
+	test?: string;
+	'gas-limit'?: string;
 };
 
 const commandModule: CommandModule<Options, Options> = {
-  command: "test",
+	command: 'test',
 
-  describe: "Run tests in Dubhe contracts",
+	describe: 'Run tests in Dubhe contracts',
 
-  builder(yargs) {
-    return yargs.options({
-      'config-path': {
-        type: "string",
-        default: "dubhe.config.ts",
-        description: "Options to pass to forge test",
-      },
-      test: {
-        type: 'string',
-        desc: 'Run a specific test',
-      },
-      'gas-limit': {
-        type: 'string',
-        desc: 'Set the gas limit for the test',
-      },
-    });
-  },
+	builder(yargs) {
+		return yargs.options({
+			'config-path': {
+				type: 'string',
+				default: 'dubhe.config.ts',
+				description: 'Options to pass to forge test',
+			},
+			test: {
+				type: 'string',
+				desc: 'Run a specific test',
+			},
+			'gas-limit': {
+				type: 'string',
+				desc: 'Set the gas limit for the test',
+			},
+		});
+	},
 
-  async handler({ 'config-path': configPath, test, 'gas-limit': gasLimit }) {
-    // Start an internal anvil process if no world address is provided
-    try {
-      console.log('🚀 Running move test');
-      const dubheConfig = (await loadConfig(configPath)) as DubheConfig;
-      const path = process.cwd();
-      const projectPath = `${path}/contracts/${dubheConfig.name}`;
-      const command = `sui move test --path ${projectPath} ${test ? ` --test ${test}` : ''} ${gasLimit ? ` --gas-limit ${gasLimit}` : ''}`;
-      execSync(command, { stdio: 'inherit', encoding: "utf-8" });
-    } catch (error: any) {
-      process.exit(0);
-    }
-  },
+	async handler({ 'config-path': configPath, test, 'gas-limit': gasLimit }) {
+		// Start an internal anvil process if no world address is provided
+		try {
+			console.log('🚀 Running move test');
+			const dubheConfig = (await loadConfig(configPath)) as DubheConfig;
+			const path = process.cwd();
+			const projectPath = `${path}/contracts/${dubheConfig.name}`;
+			const command = `sui move test --path ${projectPath} ${
+				test ? ` --test ${test}` : ''
+			} ${gasLimit ? ` --gas-limit ${gasLimit}` : ''}`;
+			execSync(command, { stdio: 'inherit', encoding: 'utf-8' });
+		} catch (error: any) {
+			process.exit(0);
+		}
+	},
 };
 
 export default commandModule;

package/src/commands/upgrade.ts

@@ -18,6 +18,7 @@ const commandModule: CommandModule<Options, Options> = {
 			network: {
 				type: 'string',
 				choices: ['mainnet', 'testnet', 'devnet', 'localnet'],
+				default: 'localnet',
 				desc: 'Network of the node (mainnet/testnet/devnet/localnet)',
 			},
 			'config-path': {

package/src/utils/callHandler.ts

@@ -5,7 +5,7 @@ import {
 	TransactionResult,
 } from '@0xobelisk/sui-client';
 import { DubheCliError } from './errors';
-import { validatePrivateKey, getOldPackageId, getObjectId } from './utils';
+import { validatePrivateKey, getOldPackageId } from './utils';
 import { DubheConfig } from '@0xobelisk/sui-common';
 import { loadMetadataFromFile } from './queryStorage';
 
@@ -26,7 +26,7 @@ const BaseTxType = [
 function validateParams(params: any[]) {
 	try {
 		params.forEach(param => {
-			const [type, value] = param.split(':');
+			const [type, _] = param.split(':');
 			if (!BaseTxType.includes(type)) {
 				throw new Error(`Invalid param type: ${type}`);
 			}

package/src/utils/generateAccount.ts

@@ -23,7 +23,7 @@ export async function generateAccountHandler(
 
 	if (force) {
 		const dubhe = new Dubhe();
-		const keypair = dubhe.getKeypair();
+		const keypair = dubhe.getSigner();
 		privateKey = keypair.getSecretKey();
 
 		fs.writeFileSync(`${path}/.env`, `PRIVATE_KEY=${privateKey}`);
@@ -59,7 +59,7 @@ export const ACCOUNT = '${keypair.toSuiAddress()}';
 		if (match && match[1]) {
 			privateKey = match[1];
 			const dubhe = new Dubhe({ secretKey: privateKey });
-			const keypair = dubhe.getKeypair();
+			const keypair = dubhe.getSigner();
 
 			if (outputTsPath) {
 				const dir = outputTsPath.substring(
@@ -89,7 +89,7 @@ export const ACCOUNT = '${keypair.toSuiAddress()}';
 
 	// If no existing private key, generate new account
 	const dubhe = new Dubhe();
-	const keypair = dubhe.getKeypair();
+	const keypair = dubhe.getSigner();
 	privateKey = keypair.getSecretKey();
 	fs.writeFileSync(`${path}/.env`, `PRIVATE_KEY=${privateKey}`);
 	console.log(chalk.green(`File created at: ${path}/.env`));

package/src/utils/index.ts

@@ -5,3 +5,4 @@ export * from './printDubhe';
 export * from './utils';
 export * from './queryStorage';
 export * from './callHandler';
+export * from './indexerHandler';