@0xobelisk/sui-cli 1.0.7 → 1.0.9

package/src/utils/indexerHandler.ts

@@ -0,0 +1,232 @@
+import { DubheCliError } from './errors';
+import {delay, getSchemaId} from './utils';
+import { DubheConfig } from '@0xobelisk/sui-common';
+import {getFullnodeUrl, SuiClient, SuiTransactionBlockResponse} from "@mysten/sui/client";
+import sqlite3 from 'sqlite3';
+import {Database, open} from 'sqlite';
+import chalk from "chalk";
+
+let sqliteDB: Database;
+
+const createDB = async (name: string) => {
+	sqliteDB = await open({
+		filename: `./${name}.db`,
+		driver: sqlite3.Database
+	});
+	await createTable(sqliteDB, name);
+	await createTxsTable(sqliteDB);
+	return sqliteDB;
+}
+const createTable = async (sqliteDB: Database, name: string) => {
+	let sql = `
+        CREATE TABLE IF NOT EXISTS ${name} (
+            id INTEGER PRIMARY KEY AUTOINCREMENT,
+            last_update_checkpoint TEXT,
+            last_update_digest TEXT,
+            name TEXT,
+            key1 TEXT,
+            key2 TEXT,
+            value TEXT,
+            is_removed BOOLEAN DEFAULT FALSE
+        )`;
+	await sqliteDB.exec(sql);
+}
+
+const createTxsTable = async (sqliteDB: Database) => {
+	let sql = `
+        CREATE TABLE IF NOT EXISTS dapp_transaction (
+            id INTEGER PRIMARY KEY AUTOINCREMENT,
+            checkpoint TEXT,
+            digest TEXT
+        )
+    `
+	await sqliteDB.exec(sql);
+}
+
+type SetRecord = {
+	name: string,
+	key1: string | object,
+	key2: string | object,
+	value: string | object
+}
+
+type RemoveRecord = {
+	name: string,
+	key1: string | object,
+	key2: string | object,
+}
+
+const processSetRecord = async (sqliteDB: Database, dbName: string, checkpoint: string, digest: string, event: unknown) => {
+	let res = event as SetRecord;
+	if ((typeof res.key1 === 'object' && res.key1 !== null) || Array.isArray(res.key1)) {
+		res.key1 = serializeData(res.key1);
+	} else if ((typeof res.key2 === 'object' && res.key2 !== null) || Array.isArray(res.key2)) {
+		res.key2 = serializeData(res.key2);
+	} else if (typeof res.value === 'object' || Array.isArray(res.value)) {
+		res.value = serializeData(res.value);
+	}
+	await insertData(sqliteDB, dbName, {
+		checkpoint: checkpoint,
+		digest: digest,
+		event: res
+	});
+}
+
+const processRemoveRecord = async (sqliteDB: Database, dbName: string, checkpoint: string, digest: string, event: unknown) => {
+	let res = event as RemoveRecord;
+	if ((typeof res.key1 === 'object' && res.key1 !== null) || Array.isArray(res.key1)) {
+		res.key1 = serializeData(res.key1);
+	} else if ((typeof res.key2 === 'object' && res.key2 !== null) || Array.isArray(res.key2)) {
+		res.key2 = serializeData(res.key2);
+	}
+	await removeData(sqliteDB, dbName, {
+		checkpoint: checkpoint,
+		digest: digest,
+		event: res
+	});
+}
+
+type SetData = {
+	checkpoint: string,
+	digest: string,
+	event: SetRecord
+}
+
+type RemoveData = {
+	checkpoint: string,
+	digest: string,
+	event: RemoveRecord
+}
+
+const serializeData = (data: object): string => {
+	if (data.hasOwnProperty("fields")) {
+		// @ts-ignore
+		return JSON.stringify(data["fields"]);
+	}
+	return JSON.stringify(data);
+};
+
+async function insertData(sqliteDB: Database, dbName: string, data: SetData) {
+	const { checkpoint, digest, event } = data;
+
+	let sql = `
+        INSERT OR REPLACE INTO ${dbName} (id, last_update_checkpoint, last_update_digest, name, key1, key2, value)
+        VALUES (
+        (SELECT id FROM ${dbName} WHERE name = ? AND (key1 = ? OR key1 IS NULL) AND (key2 = ? OR key2 IS NULL)),
+        ?, ?, ?, ?, ?, ?
+        )
+    `;
+
+	const values = [event.name, event.key1, event.key2, checkpoint, digest, event.name, event.key1, event.key2, event.value];
+
+	await sqliteDB.run(sql, values);
+	console.log("Insert or update data: ", checkpoint, digest, dbName, data);
+}
+
+async function removeData(sqliteDB: Database, dbName: string, data: RemoveData) {
+	const { checkpoint, digest, event } = data;
+
+	let sql = `
+        UPDATE ${dbName}
+        SET is_removed = TRUE
+        WHERE name = ? AND (key1 = ? OR key1 IS NULL) AND (key2 = ? OR key2 IS NULL)
+    `;
+
+	await sqliteDB.run(sql, [event.name, event.key1, event.key2]);
+	console.log("Remove data: ", checkpoint, digest, dbName, data);
+}
+
+async function insertTx(sqliteDB: Database, checkpoint: string, digest: string) {
+	let sql = `
+        INSERT INTO dapp_transaction (checkpoint, digest)
+        VALUES (?, ?)
+    `;
+
+	await sqliteDB.run(sql, [checkpoint, digest]);
+	console.log("Insert transaction: ", checkpoint, digest);
+}
+
+async function getLastDigest(sqliteDB: Database): Promise<string | null> {
+	const row = await sqliteDB.get(`
+        SELECT digest FROM dapp_transaction
+        ORDER BY id DESC
+        LIMIT 1
+    `);
+
+	return row ? row.digest : null;
+}
+
+export async function indexerHandler(
+	dubheConfig: DubheConfig,
+	network: 		'mainnet' | 'testnet' | 'devnet' | 'localnet',
+	db: 			string,
+	schemaId: 		string | undefined,
+) {
+	const path = process.cwd();
+	const projectPath = `${path}/contracts/${dubheConfig.name}`;
+
+	schemaId = schemaId || (await getSchemaId(projectPath, network));
+
+	console.log('\n🚀 Sqlite Started');
+	console.log(`  ├─ Project: ${projectPath}`);
+	console.log(`  ├─ Network: ${network}`);
+	console.log(`  ├─ Database: ${db}`);
+	console.log(`  ├─ Schema ID: ${schemaId}`);
+
+	if (!schemaId) {
+		throw new DubheCliError(
+			`Schema ID not found. Please provide a schema ID with the --schemaId flag.`
+		);
+	}
+	const client = new SuiClient({url: getFullnodeUrl(network) });
+
+	if(db === 'sqlite') {
+		sqliteDB = await createDB(dubheConfig.name);
+		while (true) {
+			await delay(2000);
+			const cursor = await getLastDigest(sqliteDB)
+			const response = await client.queryTransactionBlocks({
+				filter: {
+					// Transaction: 'FD43PRNS2PyNcYExFxwuouLqTVvonTd6NtDYMiVB7ZxZ'
+					// MoveFunction: {
+					//     package: '0x2dd117c4f48a6be9d2dd20eff67903ebf07080c7e259c7c589078fe21bb78471',
+					//     module: 'message_system',
+					//     function: 'send'
+					// }
+					ChangedObject: schemaId
+				},
+				order: "ascending",
+				cursor: cursor,
+				// limit: 2,
+				options: {
+					showEvents: true
+				}
+			});
+			const txs = response.data as SuiTransactionBlockResponse[]
+			// console.log("New Transactions: ", txs);
+			for (const tx of txs) {
+				await insertTx(sqliteDB, tx.checkpoint?.toString() as string, tx.digest);
+				if (tx.events) {
+					for (const event of tx.events) {
+						// @ts-ignore
+						if (event.parsedJson.hasOwnProperty("value")) {
+							await processSetRecord(sqliteDB, dubheConfig.name, tx.checkpoint?.toString() as string, tx.digest, event.parsedJson);
+						} else {
+							await processRemoveRecord(sqliteDB, dubheConfig.name, tx.checkpoint?.toString() as string, tx.digest, event.parsedJson);
+						}
+					}
+				}
+			}
+		};
+	} else {
+		throw new DubheCliError(
+			`Database "${db}" not supported. Supported databases: sqlite`
+		);
+	}
+}
+
+process.on('SIGINT', async () => {
+	await sqliteDB.close();
+	console.log(chalk.green('✅ Sqlite Stopped'));
+	process.exit();
+});

package/src/utils/publishHandler.ts

@@ -1,18 +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 {
-	updateVersionInFile,
 	saveContractData,
 	validatePrivateKey,
-	schema,
 	updateDubheDependency,
 	switchEnv,
 	delay,
@@ -123,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;
@@ -163,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}`);
@@ -178,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);
@@ -190,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);
@@ -213,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 => {
@@ -249,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);
@@ -268,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].structure;
-					}
-				}
-
-				schemas.push({
-					name: object.objectType,
-					objectId: object.objectId,
-					structure,
-				});
 			}
 		});
 
@@ -298,6 +269,7 @@ async function publishContract(
 			dubheConfig.name,
 			network,
 			packageId,
+			schemaId,
 			upgradeCapId,
 			version,
 			schemas
@@ -343,7 +315,6 @@ async function checkDubheFramework(projectPath: string): Promise<boolean> {
 }
 
 export async function publishDubheFramework(
-	client: SuiClient,
 	dubhe: Dubhe,
 	network: 'mainnet' | 'testnet' | 'devnet' | 'localnet'
 ) {
@@ -355,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);
@@ -370,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);
@@ -392,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 => {
@@ -423,10 +391,12 @@ export async function publishDubheFramework(
 		'dubhe-framework',
 		network,
 		packageId,
+		'',
 		upgradeCapId,
 		version,
 		schemas
 	);
+	await delay(1000);
 	console.log(chalk.green('\n✅ Dubhe Framework deployed successfully'));
 }
 
@@ -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

@@ -1,14 +1,8 @@
 import { execSync, spawn } from 'child_process';
 import chalk from 'chalk';
 import { printDubhe } from './printDubhe';
-import {
-	delay,
-	DubheCliError,
-	publishDubheFramework,
-	validatePrivateKey,
-} from '../utils';
+import { delay, DubheCliError, validatePrivateKey } from '../utils';
 import { Dubhe } from '@0xobelisk/sui-client';
-import { getFullnodeUrl, SuiClient } from '@mysten/sui/client';
 
 function isSuiStartRunning(): boolean {
 	try {
@@ -40,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,8 +1,7 @@
 import * as fsAsync from 'fs/promises';
 import { mkdirSync, writeFileSync } from 'fs';
-import { exit } from 'process';
 import { dirname } from 'path';
-import { DeploymentJsonType, schema } from './utils';
+import { DeploymentJsonType } from './utils';
 import { DubheConfig } from '@0xobelisk/sui-common';
 
 async function getDeploymentJson(
@@ -25,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');
@@ -73,7 +64,7 @@ export async function storeConfigHandler(
 	storeConfig(
 		deployment.network,
 		deployment.packageId,
-		deployment.schemas,
+		deployment.schemaId,
 		outputPath
 	);
 }