@0xobelisk/sui-cli 1.0.8 → 1.0.10

package/src/utils/publishHandler.ts

@@ -1,17 +1,10 @@
-import { Dubhe } from '@0xobelisk/sui-client';
-import { Transaction } from '@mysten/sui/transactions';
-import {
-	getFullnodeUrl,
-	SuiClient,
-	SuiTransactionBlockResponse,
-} from '@mysten/sui/client';
+import { Dubhe, Transaction } from '@0xobelisk/sui-client';
 import { execSync } from 'child_process';
 import chalk from 'chalk';
 import { DubheCliError } from './errors';
 import {
 	saveContractData,
 	validatePrivateKey,
-	schema,
 	updateDubheDependency,
 	switchEnv,
 	delay,
@@ -122,21 +115,21 @@ published-version = "${config.publishedVersion}"
 
 	fs.writeFileSync(envFilePath, newEnvContent, 'utf-8');
 }
-function capitalizeAndRemoveUnderscores(input: string): string {
-	return input
-		.split('_')
-		.map((word, index) => {
-			return index === 0
-				? word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()
-				: word.charAt(0).toUpperCase() + word.slice(1).toLowerCase();
-		})
-		.join('');
-}
-
-function getLastSegment(input: string): string {
-	const segments = input.split('::');
-	return segments.length > 0 ? segments[segments.length - 1] : '';
-}
+// function capitalizeAndRemoveUnderscores(input: string): string {
+// 	return input
+// 		.split('_')
+// 		.map((word, index) => {
+// 			return index === 0
+// 				? word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()
+// 				: word.charAt(0).toUpperCase() + word.slice(1).toLowerCase();
+// 		})
+// 		.join('');
+// }
+//
+// function getLastSegment(input: string): string {
+// 	const segments = input.split('::');
+// 	return segments.length > 0 ? segments[segments.length - 1] : '';
+// }
 
 function buildContract(projectPath: string): string[][] {
 	let modules: any, dependencies: any;
@@ -162,14 +155,14 @@ function buildContract(projectPath: string): string[][] {
 }
 
 async function publishContract(
-	client: SuiClient,
 	dubhe: Dubhe,
 	dubheConfig: DubheConfig,
 	network: 'mainnet' | 'testnet' | 'devnet' | 'localnet',
 	projectPath: string,
 	gasBudget?: number
 ) {
-	const chainId = await client.getChainIdentifier();
+	const chainId =
+		await dubhe.suiInteractor.currentClient.getChainIdentifier();
 	await removeEnvContent(`${projectPath}/Move.lock`, network);
 	console.log('\n🚀 Starting Contract Publication...');
 	console.log(`  ├─ Project: ${projectPath}`);
@@ -177,8 +170,7 @@ async function publishContract(
 	console.log(`  ├─ ChainId: ${chainId}`);
 	console.log('  ├─ Validating Environment...');
 
-	const keypair = dubhe.getKeypair();
-	console.log(`  └─ Account: ${keypair.toSuiAddress()}`);
+	console.log(`  └─ Account: ${dubhe.getAddress()}`);
 
 	console.log('\n📦 Building Contract...');
 	const [modules, dependencies] = buildContract(projectPath);
@@ -189,15 +181,11 @@ async function publishContract(
 		tx.setGasBudget(gasBudget);
 	}
 	const [upgradeCap] = tx.publish({ modules, dependencies });
-	tx.transferObjects([upgradeCap], keypair.toSuiAddress());
+	tx.transferObjects([upgradeCap], dubhe.getAddress());
 
-	let result: SuiTransactionBlockResponse;
+	let result;
 	try {
-		result = await client.signAndExecuteTransaction({
-			signer: keypair,
-			transaction: tx,
-			options: { showObjectChanges: true },
-		});
+		result = await dubhe.signAndSendTxn(tx);
 	} catch (error: any) {
 		console.error(chalk.red('  └─ Publication failed'));
 		console.error(error.message);
@@ -212,7 +200,8 @@ async function publishContract(
 	console.log('  ├─ Processing publication results...');
 	let version = 1;
 	let packageId = '';
-	let schemas: schema[] = [];
+	let schemaId = '';
+	let schemas = dubheConfig.schemas;
 	let upgradeCapId = '';
 
 	result.objectChanges!.map(object => {
@@ -248,13 +237,9 @@ async function publishContract(
 		arguments: [deployHookTx.object('0x6')],
 	});
 
-	let deployHookResult: SuiTransactionBlockResponse;
+	let deployHookResult;
 	try {
-		deployHookResult = await client.signAndExecuteTransaction({
-			signer: keypair,
-			transaction: deployHookTx,
-			options: { showEffects: true, showObjectChanges: true },
-		});
+		deployHookResult = await dubhe.signAndSendTxn(deployHookTx);
 	} catch (error: any) {
 		console.error(chalk.red('  └─ Deploy hook execution failed'));
 		console.error(error.message);
@@ -267,29 +252,16 @@ async function publishContract(
 
 		console.log('\n📋 Created Schemas:');
 		deployHookResult.objectChanges?.map(object => {
+			if (object.type === 'created' && object.objectType.includes('schema::Schema')) {
+				schemaId = object.objectId;
+			}
 			if (
 				object.type === 'created' &&
-				object.objectType.includes('_schema') &&
+				object.objectType.includes('schema') &&
 				!object.objectType.includes('dynamic_field')
 			) {
 				console.log(`  ├─ ${object.objectType}`);
 				console.log(`     └─ ID: ${object.objectId}`);
-
-				let structure: Record<string, string> = {};
-				for (let schemaKey in dubheConfig.schemas) {
-					if (
-						capitalizeAndRemoveUnderscores(schemaKey) ===
-						getLastSegment(object.objectType)
-					) {
-						structure = dubheConfig.schemas[schemaKey];
-					}
-				}
-
-				schemas.push({
-					name: object.objectType,
-					objectId: object.objectId,
-					structure,
-				});
 			}
 		});
 
@@ -297,6 +269,7 @@ async function publishContract(
 			dubheConfig.name,
 			network,
 			packageId,
+			schemaId,
 			upgradeCapId,
 			version,
 			schemas
@@ -342,7 +315,6 @@ async function checkDubheFramework(projectPath: string): Promise<boolean> {
 }
 
 export async function publishDubheFramework(
-	client: SuiClient,
 	dubhe: Dubhe,
 	network: 'mainnet' | 'testnet' | 'devnet' | 'localnet'
 ) {
@@ -354,14 +326,15 @@ export async function publishDubheFramework(
 		return;
 	}
 
-	const chainId = await client.getChainIdentifier();
+	// const chainId = await client.getChainIdentifier();
+	const chainId =
+		await dubhe.suiInteractor.currentClient.getChainIdentifier();
 	await removeEnvContent(`${projectPath}/Move.lock`, network);
 	console.log('\n🚀 Starting Contract Publication...');
 	console.log(`  ├─ Project: ${projectPath}`);
 	console.log(`  ├─ Network: ${network}`);
 
-	const keypair = dubhe.getKeypair();
-	console.log(`  └─ Account: ${keypair.toSuiAddress()}`);
+	console.log(`  └─ Account: ${dubhe.getAddress()}`);
 
 	console.log('\n📦 Building Contract...');
 	const [modules, dependencies] = buildContract(projectPath);
@@ -369,15 +342,11 @@ export async function publishDubheFramework(
 	console.log('\n🔄 Publishing Contract...');
 	const tx = new Transaction();
 	const [upgradeCap] = tx.publish({ modules, dependencies });
-	tx.transferObjects([upgradeCap], keypair.toSuiAddress());
+	tx.transferObjects([upgradeCap], dubhe.getAddress());
 
-	let result: SuiTransactionBlockResponse;
+	let result;
 	try {
-		result = await client.signAndExecuteTransaction({
-			signer: keypair,
-			transaction: tx,
-			options: { showObjectChanges: true },
-		});
+		result = await dubhe.signAndSendTxn(tx);
 	} catch (error: any) {
 		console.error(chalk.red('  └─ Publication failed'));
 		console.error(error.message);
@@ -391,7 +360,7 @@ export async function publishDubheFramework(
 
 	let version = 1;
 	let packageId = '';
-	let schemas: schema[] = [];
+	let schemas: Record<string, string> = {};
 	let upgradeCapId = '';
 
 	result.objectChanges!.map(object => {
@@ -422,6 +391,7 @@ export async function publishDubheFramework(
 		'dubhe-framework',
 		network,
 		packageId,
+		'',
 		upgradeCapId,
 		version,
 		schemas
@@ -450,22 +420,17 @@ in your contracts directory to use the default sui private key.`
 		throw new DubheCliError(`Please check your privateKey.`);
 	}
 
-	const dubhe = new Dubhe({ secretKey: privateKeyFormat });
-	const client = new SuiClient({ url: getFullnodeUrl(network) });
+	const dubhe = new Dubhe({
+		secretKey: privateKeyFormat,
+		networkType: network,
+	});
 
 	if (network === 'localnet') {
-		await publishDubheFramework(client, dubhe, network);
+		await publishDubheFramework(dubhe, network);
 	}
 
 	const path = process.cwd();
 	const projectPath = `${path}/contracts/${dubheConfig.name}`;
-	updateDubheDependency(`${projectPath}/Move.toml`, network);
-	await publishContract(
-		client,
-		dubhe,
-		dubheConfig,
-		network,
-		projectPath,
-		gasBudget
-	);
+	await updateDubheDependency(`${projectPath}/Move.toml`, network);
+	await publishContract(dubhe, dubheConfig, network, projectPath, gasBudget);
 }

package/src/utils/queryStorage.ts

@@ -1,6 +1,6 @@
 import { Dubhe, loadMetadata } from '@0xobelisk/sui-client';
 import { DubheCliError } from './errors';
-import { validatePrivateKey, getOldPackageId, getObjectId } from './utils';
+import { validatePrivateKey, getOldPackageId, getSchemaId } from './utils';
 import { DubheConfig } from '@0xobelisk/sui-common';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -36,7 +36,6 @@ function getExpectedParamsCount(storageType: string): number {
 export async function queryStorage({
 	dubheConfig,
 	schema,
-	field,
 	params,
 	network,
 	objectId,
@@ -45,7 +44,6 @@ export async function queryStorage({
 }: {
 	dubheConfig: DubheConfig;
 	schema: string;
-	field: string;
 	params?: any[];
 	network: 'mainnet' | 'testnet' | 'devnet' | 'localnet';
 	objectId?: string;
@@ -70,7 +68,7 @@ in your contracts directory to use the default sui private key.`
 
 	packageId = packageId || (await getOldPackageId(projectPath, network));
 
-	objectId = objectId || (await getObjectId(projectPath, network, schema));
+	objectId = objectId || (await getSchemaId(projectPath, network));
 
 	let metadata;
 	if (metadataFilePath) {
@@ -92,15 +90,7 @@ in your contracts directory to use the default sui private key.`
 		);
 	}
 
-	if (!dubheConfig.schemas[schema][field]) {
-		throw new DubheCliError(
-			`Field "${field}" not found in schema "${schema}". Available fields: ${Object.keys(
-				dubheConfig.schemas[schema]
-			).join(', ')}`
-		);
-	}
-
-	const storageType = dubheConfig.schemas[schema][field];
+	const storageType = dubheConfig.schemas[schema];
 
 	const processedParams = params || [];
 	if (!validateParams(storageType, processedParams)) {
@@ -117,9 +107,8 @@ in your contracts directory to use the default sui private key.`
 		packageId,
 		metadata,
 	});
-	const result = await dubhe.state({
+	const result = await dubhe.parseState({
 		schema,
-		field,
 		objectId,
 		storageType,
 		params: processedParams,

package/src/utils/startNode.ts

@@ -34,7 +34,7 @@ async function printAccounts() {
 	console.log('==========');
 	privateKeys.forEach((privateKey, index) => {
 		const dubhe = new Dubhe({ secretKey: privateKey });
-		const keypair = dubhe.getKeypair();
+		const keypair = dubhe.getSigner();
 		spawn(
 			'curl',
 			[

package/src/utils/storeConfig.ts

@@ -1,7 +1,7 @@
 import * as fsAsync from 'fs/promises';
 import { mkdirSync, writeFileSync } from 'fs';
 import { dirname } from 'path';
-import { DeploymentJsonType, schema } from './utils';
+import { DeploymentJsonType } from './utils';
 import { DubheConfig } from '@0xobelisk/sui-common';
 
 async function getDeploymentJson(
@@ -24,24 +24,16 @@ async function getDeploymentJson(
 function storeConfig(
 	network: string,
 	packageId: string,
-	schemas: schema[],
+	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}'
+`
 
-${schemas
-	.map(
-		schema =>
-			`export const ${schema.name.split('::')[2]}_Object_Id = '${
-				schema.objectId
-			}'`
-	)
-	.join('\n')}
-`;
 	// if (outputPath) {
 	writeOutput(code, outputPath, 'storeConfig');
 	// writeOutput(code, `${path}/src/chain/config.ts`, 'storeConfig');
@@ -72,7 +64,7 @@ export async function storeConfigHandler(
 	storeConfig(
 		deployment.network,
 		deployment.packageId,
-		deployment.schemas,
+		deployment.schemaId,
 		outputPath
 	);
 }

package/src/utils/upgradeHandler.ts

@@ -5,59 +5,44 @@ import { execSync } from 'child_process';
 import chalk from 'chalk';
 import { DubheCliError, UpgradeError } from './errors';
 import {
-	getOldPackageId,
-	getVersion,
-	getUpgradeCap,
-	saveContractData,
-	validatePrivateKey,
-	getOnchainSchemas,
-	switchEnv,
+    getOldPackageId,
+    getVersion,
+    getUpgradeCap,
+    saveContractData,
+    validatePrivateKey,
+    getOnchainSchemas,
+    switchEnv, getSchemaId,
 } from './utils';
 import * as fs from 'fs';
 import * as path from 'path';
 import { DubheConfig } from '@0xobelisk/sui-common';
 
-type Field = {
-	name: string;
-	type: string;
-};
-
 type Migration = {
 	schemaName: string;
-	fields: Field[];
+	fields: string;
 };
 
 function updateMigrateMethod(
 	projectPath: string,
 	migrations: Migration[]
 ): void {
-	migrations.forEach(migration => {
-		let filePath = `${projectPath}/sources/codegen/schemas/${migration.schemaName}.move`;
+		let filePath = `${projectPath}/sources/codegen/schema.move`;
 		const fileContent = fs.readFileSync(filePath, 'utf-8');
 		const migrateMethodRegex = new RegExp(
-			`public fun migrate\\(_${
-				migration.schemaName
-			}: &mut ${capitalizeAndRemoveUnderscores(
-				migration.schemaName
-			)}, _cap: &UpgradeCap\\) {[^}]*}`
+			`public fun migrate\\(_schema: &mut Schema, _cap: &UpgradeCap, _ctx: &mut TxContext\\) {[^}]*}`
 		);
 		const newMigrateMethod = `
-public fun migrate(${
-			migration.schemaName
-		}: &mut ${capitalizeAndRemoveUnderscores(
-			migration.schemaName
-		)}, _cap: &UpgradeCap) {
-${migration.fields
-	.map(field => {
+public fun migrate(_schema: &mut Schema, _cap: &UpgradeCap, _ctx: &mut TxContext) {
+${migrations.map(migration => {
 		let storage_type = '';
-		if (field.type.includes('StorageValue')) {
-			storage_type = `storage_value::new()`;
-		} else if (field.type.includes('StorageMap')) {
-			storage_type = `storage_map::new()`;
-		} else if (field.type.includes('StorageDoubleMap')) {
-			storage_type = `storage_double_map::new()`;
+		if (migration.fields.includes('StorageValue')) {
+			storage_type = `storage_value::new(b"${migration.schemaName}", _ctx)`;
+		} else if (migration.fields.includes('StorageMap')) {
+			storage_type = `storage_map::new(b"${migration.schemaName}", _ctx)`;
+		} else if (migration.fields.includes('StorageDoubleMap')) {
+			storage_type = `storage_double_map::new(b"${migration.schemaName}", _ctx)`;
 		}
-		return `storage_migration::add_field<${field.type}>(&mut ${migration.schemaName}.id, b"${field.name}", ${storage_type});`;
+		return `storage::add_field<${migration.fields}>(&mut _schema.id, b"${migration.schemaName}", ${storage_type});`;
 	})
 	.join('')}
 }
@@ -68,23 +53,6 @@ ${migration.fields
 			newMigrateMethod
 		);
 		fs.writeFileSync(filePath, updatedContent, 'utf-8');
-	});
-}
-
-function capitalizeAndRemoveUnderscores(input: string): string {
-	return input
-		.split('_')
-		.map((word, index) => {
-			return index === 0
-				? word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()
-				: word.charAt(0).toUpperCase() + word.slice(1).toLowerCase();
-		})
-		.join('');
-}
-
-function getLastSegment(input: string): string {
-	const segments = input.split('::');
-	return segments.length > 0 ? segments[segments.length - 1] : '';
 }
 
 function replaceEnvField(
@@ -155,7 +123,7 @@ in your contracts directory to use the default sui private key.`
 	const dubhe = new Dubhe({
 		secretKey: privateKeyFormat,
 	});
-	const keypair = dubhe.getKeypair();
+	const keypair = dubhe.getSigner();
 
 	const client = new SuiClient({
 		url: getFullnodeUrl(network),
@@ -164,6 +132,7 @@ in your contracts directory to use the default sui private key.`
 	let oldVersion = Number(await getVersion(projectPath, network));
 	let oldPackageId = await getOldPackageId(projectPath, network);
 	let upgradeCap = await getUpgradeCap(projectPath, network);
+	let schemaId = await getSchemaId(projectPath, network);
 
 	const original_published_id = replaceEnvField(
 		`${projectPath}/Move.lock`,
@@ -174,33 +143,11 @@ in your contracts directory to use the default sui private key.`
 
 	let pendingMigration: Migration[] = [];
 	let schemas = await getOnchainSchemas(projectPath, network);
-	for (let schemaKey in config.schemas) {
-		schemas.forEach(schema => {
-			if (
-				capitalizeAndRemoveUnderscores(schemaKey) ==
-				getLastSegment(schema.name)
-			) {
-				let migrate: Migration = { schemaName: '', fields: [] };
-				let fields: Field[] = [];
-				let isMigration = false;
-				for (const key in config.schemas[schemaKey]) {
-					if (!(key in schema.structure)) {
-						isMigration = true;
-						fields.push({
-							name: key,
-							type: config.schemas[schemaKey][key],
-						});
-						schema.structure[key] = config.schemas[schemaKey][key];
-					}
-				}
-				if (isMigration) {
-					migrate.schemaName = schemaKey;
-					migrate.fields = fields;
-					pendingMigration.push(migrate);
-				}
-			}
-		});
-	}
+	Object.entries(config.schemas).forEach(([key, value]) => {
+		if (!schemas.hasOwnProperty(key)) {
+			pendingMigration.push({ schemaName: key, fields: value });
+		}
+	});
 
 	pendingMigration.forEach(migration => {
 		console.log(`\n🚀 Starting Migration for ${migration.schemaName}...`);
@@ -304,9 +251,10 @@ in your contracts directory to use the default sui private key.`
 			name,
 			network,
 			newPackageId,
+            schemaId,
 			upgradeCap,
 			oldVersion + 1,
-			schemas
+			config.schemas
 		);
 	} catch (error: any) {
 		console.log(chalk.red('Upgrade failed!'));

package/src/utils/utils.ts

@@ -7,19 +7,14 @@ import * as fs from 'fs';
 import chalk from 'chalk';
 import { spawn } from 'child_process';
 
-export type schema = {
-	name: string;
-	objectId: string;
-	structure: Record<string, string>;
-};
-
 export type DeploymentJsonType = {
 	projectName: string;
 	network: 'mainnet' | 'testnet' | 'devnet' | 'localnet';
 	packageId: string;
+	schemaId: string;
 	upgradeCap: string;
 	version: number;
-	schemas: schema[];
+	schemas: Record<string, string>;
 };
 
 export function validatePrivateKey(privateKey: string): false | string {
@@ -81,7 +76,7 @@ async function getDeploymentJson(projectPath: string, network: string) {
 export async function getOnchainSchemas(
 	projectPath: string,
 	network: string
-): Promise<schema[]> {
+): Promise<Record<string, string>> {
 	const deployment = await getDeploymentJson(projectPath, network);
 	return deployment.schemas;
 }
@@ -110,25 +105,12 @@ export async function getOldPackageId(
 	return deployment.packageId;
 }
 
-export async function getObjectId(
+export async function getSchemaId(
 	projectPath: string,
-	network: string,
-	schemaName: string
+	network: string
 ): Promise<string> {
 	const deployment = await getDeploymentJson(projectPath, network);
-	const schema = deployment.schemas.find(schema =>
-		schema.name
-			.toLowerCase()
-			.endsWith(`::${schemaName.toLowerCase()}_schema::${schemaName}`)
-	);
-
-	if (!schema?.objectId) {
-		throw new Error(
-			`Schema '${schemaName}' not found in deployment history`
-		);
-	}
-
-	return schema.objectId;
+	return deployment.schemaId;
 }
 
 export async function getUpgradeCap(
@@ -139,28 +121,20 @@ export async function getUpgradeCap(
 	return deployment.upgradeCap;
 }
 
-export async function getObjectIdBySchemaName(
-	projectPath: string,
-	network: string,
-	schemaName: string
-): Promise<string | undefined> {
-	const deployment = await getDeploymentJson(projectPath, network);
-	return deployment.schemas.find(schema => schema.name.includes(schemaName))
-		?.objectId;
-}
-
 export function saveContractData(
 	projectName: string,
 	network: 'mainnet' | 'testnet' | 'devnet' | 'localnet',
 	packageId: string,
+	schemaId: string,
 	upgradeCap: string,
 	version: number,
-	schemas: schema[]
+	schemas: Record<string, string>
 ) {
 	const DeploymentData: DeploymentJsonType = {
 		projectName,
 		network,
 		packageId,
+		schemaId,
 		schemas,
 		upgradeCap,
 		version,
@@ -203,7 +177,7 @@ function getDubheDependency(
 	}
 }
 
-export function updateDubheDependency(
+export async function updateDubheDependency(
 	filePath: string,
 	network: 'mainnet' | 'testnet' | 'devnet' | 'localnet'
 ) {