@0xobelisk/sui-common 0.5.15 → 0.5.18

package/src/codegen/utils/renderMove/generateScript.ts

@@ -1,22 +1,30 @@
-import { ObeliskConfig } from "../../types";
-import { formatAndWriteMove } from "../formatAndWrite";
-import { existsSync } from "fs";
+import { DubheConfig } from '../../types';
+import { formatAndWriteMove } from '../formatAndWrite';
+import { existsSync } from 'fs';
 
-export async function generateDeployHook(config: ObeliskConfig, srcPrefix: string) {
-    if (
-        !existsSync(
-            `${srcPrefix}/contracts/${config.name}/sources/script/deploy_hook.move`
-        )
-    ) {
-        let code = `module ${config.name}::deploy_hook {
-    use obelisk::dapps_schema::Dapps;
-    use obelisk::dapps_system;
+export async function generateDeployHook(
+	config: DubheConfig,
+	srcPrefix: string
+) {
+	console.log('\n📝 Starting Deploy Hook Generation...');
+	console.log(
+		`  └─ Output path: ${srcPrefix}/contracts/${config.name}/sources/script/deploy_hook.move`
+	);
+
+	if (
+		!existsSync(
+			`${srcPrefix}/contracts/${config.name}/sources/script/deploy_hook.move`
+		)
+	) {
+		let code = `module ${config.name}::deploy_hook {
+    use dubhe::dapps_schema::Dapps;
+    use dubhe::dapps_system;
     use ${config.name}::dapp_key::DappKey;
     use std::ascii;
     use sui::clock::Clock;
     use sui::transfer::public_share_object;
     #[test_only]
-      use obelisk::dapps_schema;
+      use dubhe::dapps_schema;
       #[test_only]
       use sui::clock;
       #[test_only]
@@ -25,7 +33,7 @@ export async function generateDeployHook(config: ObeliskConfig, srcPrefix: strin
       use sui::test_scenario::Scenario;
 
     public entry fun run(dapps: &mut Dapps, clock: &Clock, ctx: &mut TxContext) {
-        // Register the dapp to obelisk.
+        // Register the dapp to dubhe.
         dapps_system::register<DappKey>(
             dapps,
             ascii::string(b"${config.name}"),
@@ -33,16 +41,20 @@ export async function generateDeployHook(config: ObeliskConfig, srcPrefix: strin
             clock,
             ctx
         );
-        ${Object.keys(config.schemas).map(schemaName => {
-            return `let ${schemaName} = ${config.name}::${schemaName}_schema::register(dapps, ctx);`
-        }).join("\n")}
+        ${Object.keys(config.schemas)
+			.map(schemaName => {
+				return `let ${schemaName} = ${config.name}::${schemaName}_schema::register(dapps, ctx);`;
+			})
+			.join('\n')}
         // Logic that needs to be automated once the contract is deployed
 
 
         // Share the dapp object with the public
-        ${Object.keys(config.schemas).map(schemaName => {
-          return `public_share_object(${schemaName});`
-        }).join("\n")}
+        ${Object.keys(config.schemas)
+			.map(schemaName => {
+				return `public_share_object(${schemaName});`;
+			})
+			.join('\n')}
     }
 
     #[test_only]
@@ -63,22 +75,23 @@ export async function generateDeployHook(config: ObeliskConfig, srcPrefix: strin
   }
 }
 `;
-        await formatAndWriteMove(
-            code,
-            `${srcPrefix}/contracts/${config.name}/sources/script/deploy_hook.move`,
-            "formatAndWriteMove"
-        );
-    }
+		await formatAndWriteMove(
+			code,
+			`${srcPrefix}/contracts/${config.name}/sources/script/deploy_hook.move`,
+			'formatAndWriteMove'
+		);
+	}
+	console.log('✅ Deploy Hook Generation Complete\n');
 }
 
-export function generateMigrate(config: ObeliskConfig, srcPrefix: string) {
-    if (
-        !existsSync(
-            `${srcPrefix}/contracts/${config.name}/sources/script/migrate.move`
-        )
-    ) {
-        let code = `module ${config.name}::migrate {
-    use obelisk::world::{World, AdminCap};
+export function generateMigrate(config: DubheConfig, srcPrefix: string) {
+	if (
+		!existsSync(
+			`${srcPrefix}/contracts/${config.name}/sources/script/migrate.move`
+		)
+	) {
+		let code = `module ${config.name}::migrate {
+    use dubhe::world::{World, AdminCap};
 
     /// Not the right admin for this world
     const ENotAdmin: u64 = 0;
@@ -89,7 +102,7 @@ export function generateMigrate(config: ObeliskConfig, srcPrefix: string) {
     public entry fun run(world: &mut World, admin_cap: &AdminCap) {
         assert!(world.admin() == object::id(admin_cap), ENotAdmin);
         assert!(world.version() < VERSION, ENotUpgrade);
-        *obelisk::world::mut_version(world, admin_cap) = VERSION;
+        *dubhe::world::mut_version(world, admin_cap) = VERSION;
     }
 
     public fun assert_version(world: &World){
@@ -97,11 +110,10 @@ export function generateMigrate(config: ObeliskConfig, srcPrefix: string) {
     }
 }
 `;
-        formatAndWriteMove(
-            code,
-            `${srcPrefix}/contracts/${config.name}/sources/script/migrate.move`,
-            "formatAndWriteMove"
-        );
-    }
+		formatAndWriteMove(
+			code,
+			`${srcPrefix}/contracts/${config.name}/sources/script/migrate.move`,
+			'formatAndWriteMove'
+		);
+	}
 }
-

package/src/codegen/utils/renderMove/generateSystem.ts

@@ -1,23 +1,30 @@
-import { ObeliskConfig } from "../../types";
-import { formatAndWriteMove } from "../formatAndWrite";
-import { existsSync } from "fs";
+import { DubheConfig } from '../../types';
+import { formatAndWriteMove } from '../formatAndWrite';
+import { existsSync } from 'fs';
 
-export async function generateSystem(config: ObeliskConfig, srcPrefix: string) {
-  config.systems.map(async (systemName) => {
-    if (
-      !existsSync(
-        `${srcPrefix}/contracts/${config.name}/sources/system/${systemName}.move`
-      )
-    ) {
-        let code = `module ${config.name}::${systemName}_system {
+export async function generateSystem(config: DubheConfig, srcPrefix: string) {
+	console.log('\n⚙️ Starting System Generation...');
+	config.systems.map(async systemName => {
+		console.log(`  ├─ Generating system: ${systemName}`);
+		console.log(
+			`     └─ Output path: ${srcPrefix}/contracts/${config.name}/sources/system/${systemName}.move`
+		);
+
+		if (
+			!existsSync(
+				`${srcPrefix}/contracts/${config.name}/sources/system/${systemName}.move`
+			)
+		) {
+			let code = `module ${config.name}::${systemName}_system {
 
 }
 `;
-            await formatAndWriteMove(
-                code,
-                `${srcPrefix}/contracts/${config.name}/sources/system/${systemName}.move`,
-                "formatAndWriteMove"
-            );
-    }
-  });
+			await formatAndWriteMove(
+				code,
+				`${srcPrefix}/contracts/${config.name}/sources/system/${systemName}.move`,
+				'formatAndWriteMove'
+			);
+		}
+	});
+	console.log('✅ System Generation Complete\n');
 }

package/src/codegen/utils/renderMove/generateToml.ts

@@ -1,19 +1,28 @@
-import { ObeliskConfig } from '../../types';
+import { DubheConfig } from '../../types';
 import { formatAndWriteMove } from '../formatAndWrite';
 
-export async function generateToml(config: ObeliskConfig, srcPrefix: string) {
+export async function generateToml(
+	config: DubheConfig,
+	srcPrefix: string,
+	frameworkId: string
+) {
+	console.log('\n📄 Starting Move.toml Generation...');
+	console.log(
+		`  └─ Output path: ${srcPrefix}/contracts/${config.name}/Move.toml`
+	);
+
 	let code = `[package]
 name = "${config.name}"
 version = "0.0.1"
 edition = "2024.beta"
 
 [dependencies]
-Sui = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/sui-framework", rev = "mainnet-v1.31.1" }
-Obelisk = { git = "https://github.com/0xobelisk/obelisk-engine.git", subdir = "packages/obelisk-framework", rev = "main" }
+Sui = { git = "https://github.com/MystenLabs/sui.git", subdir = "crates/sui-framework/packages/sui-framework", rev = "mainnet-v1.36.2" }
+Dubhe = { git = "https://github.com/0xobelisk/dubhe.git", subdir = "packages/dubhe-framework", rev = "main" }
 
 [addresses]
-sui =  "0x2"
-obelisk =  "0x3dc2d6239eed38c9798444afbf4bada0998ec98edc365713864405fe64203256"
+sui = "0x2"
+dubhe = "${frameworkId}"
 ${config.name} = "0x0"
 `;
 	await formatAndWriteMove(
@@ -21,4 +30,5 @@ ${config.name} = "0x0"
 		`${srcPrefix}/contracts/${config.name}/Move.toml`,
 		'formatAndWriteMove'
 	);
+	console.log('✅ Move.toml Generation Complete\n');
 }

package/src/codegen/utils/renderMove/schemaGen.ts

@@ -0,0 +1,69 @@
+import { SchemaType, DubheConfig } from '../../types';
+import { rmdirSync, existsSync } from 'fs';
+import { deleteFolderRecursive } from './common';
+import { generateSystem } from './generateSystem';
+import { generateToml } from './generateToml';
+import { generateSchemaData, generateSchemaStructure } from './generateSchema';
+import { generateDeployHook, generateMigrate } from './generateScript';
+import { generateDappKey } from './generateDappKey';
+
+function matchFrameworkId(
+	network: 'mainnet' | 'testnet' | 'devnet' | 'localnet'
+): string {
+	switch (network) {
+		case 'testnet':
+			return '0x1736475f476c5dec96f33c03c778843f572239d3a887d795eef66d2836484c28';
+		case 'localnet':
+			return '0x1736475f476c5dec96f33c03c778843f572239d3a887d795eef66d2836484c28';
+		default:
+			return '0x1736475f476c5dec96f33c03c778843f572239d3a887d795eef66d2836484c28';
+	}
+}
+
+export async function schemaGen(
+	config: DubheConfig,
+	srcPrefix?: string,
+	network?: 'mainnet' | 'testnet' | 'devnet' | 'localnet',
+	frameworkId?: string
+) {
+	console.log('\n🚀 Starting Schema Generation Process...');
+	console.log('📋 Project Configuration:');
+	console.log(`  ├─ Name: ${config.name}`);
+	console.log(
+		`  ├─ Description: ${config.description || 'No description provided'}`
+	);
+	console.log(`  ├─ Network: ${network || 'testnet'}`);
+	console.log(
+		`  └─ Framework ID: ${
+			frameworkId || matchFrameworkId(network ?? 'testnet')
+		}\n`
+	);
+
+	const path = srcPrefix ?? process.cwd();
+
+	frameworkId = frameworkId || matchFrameworkId(network ?? 'testnet');
+
+	if (existsSync(`${path}/contracts/${config.name}`)) {
+		deleteFolderRecursive(
+			`${path}/contracts/${config.name}/sources/codegen`
+		);
+	}
+
+	if (!existsSync(`${path}/contracts/${config.name}/Move.toml`)) {
+		await generateToml(config, path, frameworkId);
+	}
+
+	if (
+		!existsSync(
+			`${path}/contracts/${config.name}/sources/script/deploy_hook.move`
+		)
+	) {
+		await generateDeployHook(config, path);
+	}
+
+	await generateSystem(config, path);
+	await generateSchemaData(config.name, config.schemas, path);
+	await generateSchemaStructure(config.name, config.schemas, path);
+	await generateDappKey(config, path);
+	console.log('✅ Schema Generation Process Complete!\n');
+}

package/src/debug.ts

@@ -1,7 +1,7 @@
 import createDebug from "debug";
 
-export const debug = createDebug("obelisk:common");
-export const error = createDebug("obelisk:common");
+export const debug = createDebug("dubhe:common");
+export const error = createDebug("dubhe:common");
 
 // Pipe debug output to stdout instead of stderr
 debug.log = console.debug.bind(console);

package/src/codegen/utils/renderMove/worldgen.ts

@@ -1,34 +0,0 @@
-import { SchemaType, ObeliskConfig } from "../../types";
-import { rmdirSync, existsSync } from "fs";
-import { deleteFolderRecursive } from "./common";
-import { generateSystem } from "./generateSystem";
-import { generateToml } from "./generateToml";
-import {generateSchemaData, generateSchemaStructure} from "./generateSchema";
-import {generateDeployHook, generateMigrate} from "./generateScript";
-import {generateDappKey} from "./generateDappKey";
-
-export async function worldgen(config: ObeliskConfig, srcPrefix?: string) {
-  let path = "";
-  if (srcPrefix === undefined) {
-    path = process.cwd();
-  } else {
-    path = srcPrefix;
-  }
-
-  if (existsSync(`${path}/contracts/${config.name}`)) {
-    deleteFolderRecursive(`${path}/contracts/${config.name}/sources/codegen`);
-  }
-
-  if (!existsSync(`${path}/contracts/${config.name}/Move.toml`)) {
-    await generateToml(config, path);
-  }
-
-  if (!existsSync(`${path}/contracts/${config.name}/sources/script/deploy_hook.move`)) {
-    await generateDeployHook(config, path);
-  }
-
-  await generateSystem(config, path);
-  await generateSchemaData(config.name, config.schemas, path);
-  await generateSchemaStructure(config.name, config.schemas, path);
-  await generateDappKey(config, path);
-}