@0xobelisk/sui-cli 1.2.0-pre.3 → 1.2.0-pre.33

package/src/utils/publishHandler.ts

@@ -4,19 +4,17 @@ import chalk from 'chalk';
 import {
   saveContractData,
   updateDubheDependency,
+  updateMoveTomlAddress,
   switchEnv,
   delay,
-  getDubheSchemaId,
-  initializeDubhe
+  getDubheDappHub,
+  initializeDubhe,
+  saveMetadata
 } from './utils';
 import { DubheConfig } from '@0xobelisk/sui-common';
 import * as fs from 'fs';
 import * as path from 'path';
 
-const MAX_RETRIES = 60; // 60s timeout
-const RETRY_INTERVAL = 1000; // 1s retry interval
-const SPINNER = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
-
 async function removeEnvContent(
   filePath: string,
   networkType: 'mainnet' | 'testnet' | 'devnet' | 'localnet'
@@ -154,132 +152,28 @@ interface ObjectChange {
 }
 
 async function waitForNode(dubhe: Dubhe): Promise<string> {
-  let retryCount = 0;
-  let spinnerIndex = 0;
-  const startTime = Date.now();
-  let isInterrupted = false;
-  let chainId = '';
-  let hasShownBalanceWarning = false;
-
-  const handleInterrupt = () => {
-    isInterrupted = true;
-    process.stdout.write('\r' + ' '.repeat(50) + '\r');
-    console.log('\n  └─ Operation cancelled by user');
-    process.exit(0);
-  };
-  process.on('SIGINT', handleInterrupt);
-
-  try {
-    // 第一阶段：等待获取 chainId
-    while (retryCount < MAX_RETRIES && !isInterrupted && !chainId) {
-      try {
-        chainId = await dubhe.suiInteractor.currentClient.getChainIdentifier();
-      } catch (error) {
-        // 忽略错误，继续重试
-      }
-
-      if (isInterrupted) break;
-
-      if (!chainId) {
-        retryCount++;
-        if (retryCount === MAX_RETRIES) {
-          console.log(chalk.red(`  └─ Failed to connect to node after ${MAX_RETRIES} attempts`));
-          console.log(chalk.red('  └─ Please check if the Sui node is running.'));
-          process.exit(1);
-        }
-
-        const elapsedTime = Math.floor((Date.now() - startTime) / 1000);
-        const spinner = SPINNER[spinnerIndex % SPINNER.length];
-        spinnerIndex++;
-
-        process.stdout.write(`\r  ├─ ${spinner} Waiting for node... (${elapsedTime}s)`);
-        await new Promise((resolve) => setTimeout(resolve, RETRY_INTERVAL));
-      }
-    }
+  const chainId = await dubhe.suiInteractor.currentClient.getChainIdentifier();
+  console.log(`  ├─ ChainId: ${chainId}`);
+  const address = dubhe.getAddress();
+  const coins = await dubhe.suiInteractor.currentClient.getCoins({
+    owner: address,
+    coinType: '0x2::sui::SUI'
+  });
 
-    // 显示 chainId
-    process.stdout.write('\r' + ' '.repeat(50) + '\r');
-    console.log(`  ├─ ChainId: ${chainId}`);
-
-    // 第二阶段：检查部署账户余额
-    retryCount = 0;
-    while (retryCount < MAX_RETRIES && !isInterrupted) {
-      try {
-        const address = dubhe.getAddress();
-        const coins = await dubhe.suiInteractor.currentClient.getCoins({
-          owner: address,
-          coinType: '0x2::sui::SUI'
-        });
-
-        if (coins.data.length > 0) {
-          const balance = coins.data.reduce((sum, coin) => sum + Number(coin.balance), 0);
-          if (balance > 0) {
-            process.stdout.write('\r' + ' '.repeat(50) + '\r');
-            console.log(`  ├─ Deployer balance: ${balance / 10 ** 9} SUI`);
-            return chainId;
-          } else if (!hasShownBalanceWarning) {
-            process.stdout.write('\r' + ' '.repeat(50) + '\r');
-            console.log(
-              chalk.yellow(
-                `  ├─ Deployer balance: 0 SUI, please ensure your account has sufficient SUI balance`
-              )
-            );
-            hasShownBalanceWarning = true;
-          }
-        } else if (!hasShownBalanceWarning) {
-          process.stdout.write('\r' + ' '.repeat(50) + '\r');
-          console.log(
-            chalk.yellow(
-              `  ├─ No SUI coins found in deployer account, please ensure your account has sufficient SUI balance`
-            )
-          );
-          hasShownBalanceWarning = true;
-        }
-
-        retryCount++;
-        if (retryCount === MAX_RETRIES) {
-          console.log(
-            chalk.red(`  └─ Deployer account has no SUI balance after ${MAX_RETRIES} attempts`)
-          );
-          console.log(chalk.red('  └─ Please ensure your account has sufficient SUI balance.'));
-          process.exit(1);
-        }
-
-        const elapsedTime = Math.floor((Date.now() - startTime) / 1000);
-        const spinner = SPINNER[spinnerIndex % SPINNER.length];
-        spinnerIndex++;
-
-        process.stdout.write(`\r  ├─ ${spinner} Checking deployer balance... (${elapsedTime}s)`);
-        await new Promise((resolve) => setTimeout(resolve, RETRY_INTERVAL));
-      } catch (error) {
-        if (isInterrupted) break;
-
-        retryCount++;
-        if (retryCount === MAX_RETRIES) {
-          console.log(
-            chalk.red(`  └─ Failed to check deployer balance after ${MAX_RETRIES} attempts`)
-          );
-          console.log(chalk.red('  └─ Please check your account and network connection.'));
-          process.exit(1);
-        }
-
-        const elapsedTime = Math.floor((Date.now() - startTime) / 1000);
-        const spinner = SPINNER[spinnerIndex % SPINNER.length];
-        spinnerIndex++;
-
-        process.stdout.write(`\r  ├─ ${spinner} Checking deployer balance... (${elapsedTime}s)`);
-        await new Promise((resolve) => setTimeout(resolve, RETRY_INTERVAL));
-      }
+  if (coins.data.length > 0) {
+    const balance = coins.data.reduce((sum, coin) => sum + Number(coin.balance), 0);
+    if (balance > 0) {
+      console.log(`  ├─ Deployer balance: ${balance / 10 ** 9} SUI`);
+      return chainId;
+    } else {
+      console.log(
+        chalk.yellow(
+          `  ├─ Deployer balance: 0 SUI, please ensure your account has sufficient SUI balance`
+        )
+      );
     }
-  } finally {
-    process.removeListener('SIGINT', handleInterrupt);
-  }
-
-  if (isInterrupted) {
-    process.exit(0);
   }
-
-  throw new Error('Failed to connect to node');
+  return chainId;
 }
 
 async function publishContract(
@@ -311,52 +205,15 @@ async function publishContract(
   const [upgradeCap] = tx.publish({ modules, dependencies });
   tx.transferObjects([upgradeCap], dubhe.getAddress());
 
-  let result: any = null;
-  let retryCount = 0;
-  let spinnerIndex = 0;
-  const startTime = Date.now();
-  let isInterrupted = false;
-
-  const handleInterrupt = () => {
-    isInterrupted = true;
-    process.stdout.write('\r' + ' '.repeat(50) + '\r');
-    console.log('\n  └─ Operation cancelled by user');
-    process.exit(0);
-  };
-  process.on('SIGINT', handleInterrupt);
-
+  let result;
   try {
-    while (retryCount < MAX_RETRIES && !result && !isInterrupted) {
-      try {
-        result = await dubhe.signAndSendTxn({ tx });
-      } catch (error) {
-        if (isInterrupted) break;
-
-        retryCount++;
-        if (retryCount === MAX_RETRIES) {
-          console.log(chalk.red(`  └─ Publication failed after ${MAX_RETRIES} attempts`));
-          console.log(chalk.red('  └─ Please check your network connection and try again later.'));
-          process.exit(1);
-        }
-
-        const elapsedTime = Math.floor((Date.now() - startTime) / 1000);
-        const spinner = SPINNER[spinnerIndex % SPINNER.length];
-        spinnerIndex++;
-
-        process.stdout.write(`\r  ├─ ${spinner} Retrying... (${elapsedTime}s)`);
-        await new Promise((resolve) => setTimeout(resolve, RETRY_INTERVAL));
-      }
-    }
-  } finally {
-    process.removeListener('SIGINT', handleInterrupt);
-  }
-
-  if (isInterrupted) {
-    process.exit(0);
+    result = await dubhe.signAndSendTxn({ tx });
+  } catch (error: any) {
+    console.error(chalk.red('  └─ Publication failed'));
+    console.error(error.message);
+    process.exit(1);
   }
 
-  process.stdout.write('\r' + ' '.repeat(50) + '\r');
-
   if (!result || result.effects?.status.status === 'failure') {
     console.log(chalk.red('  └─ Publication failed'));
     process.exit(1);
@@ -365,10 +222,12 @@ async function publishContract(
   console.log('  ├─ Processing publication results...');
   let version = 1;
   let packageId = '';
-  let schemaId = '';
-  let schemas = dubheConfig.schemas;
+  let dappHub = '';
+  let components = dubheConfig.components;
   let upgradeCapId = '';
 
+  let printObjects: any[] = [];
+
   result.objectChanges!.map((object: ObjectChange) => {
     if (object.type === 'published') {
       console.log(`  ├─ Package ID: ${object.packageId}`);
@@ -382,6 +241,16 @@ async function publishContract(
       console.log(`  ├─ Upgrade Cap: ${object.objectId}`);
       upgradeCapId = object.objectId || '';
     }
+    if (
+      object.type === 'created' &&
+      object.objectType &&
+      object.objectType.includes('dapp_hub::DappHub')
+    ) {
+      dappHub = object.objectId || '';
+    }
+    if (object.type === 'created') {
+      printObjects.push(object);
+    }
   });
 
   console.log(`  └─ Transaction: ${result.digest}`);
@@ -393,13 +262,11 @@ async function publishContract(
 
   const deployHookTx = new Transaction();
   let args = [];
-  if (dubheConfig.name !== 'dubhe') {
-    let dubheSchemaId = await getDubheSchemaId(network);
-    args.push(deployHookTx.object(dubheSchemaId));
-  }
+  let dubheDappHub = dubheConfig.name === 'dubhe' ? dappHub : await getDubheDappHub(network);
+  args.push(deployHookTx.object(dubheDappHub));
   args.push(deployHookTx.object('0x6'));
   deployHookTx.moveCall({
-    target: `${packageId}::${dubheConfig.name}_genesis::run`,
+    target: `${packageId}::genesis::run`,
     arguments: args
   });
 
@@ -416,35 +283,29 @@ async function publishContract(
     console.log('  ├─ Hook execution successful');
     console.log(`  ├─ Transaction: ${deployHookResult.digest}`);
 
-    console.log('\n📋 Created Schemas:');
-    deployHookResult.objectChanges?.map((object: ObjectChange) => {
-      if (
-        object.type === 'created' &&
-        object.objectType &&
-        object.objectType.includes('schema::Schema')
-      ) {
-        schemaId = object.objectId || '';
-      }
-      if (
-        object.type === 'created' &&
-        object.objectType &&
-        object.objectType.includes('schema') &&
-        !object.objectType.includes('dynamic_field')
-      ) {
-        console.log(`  ├─ Type: ${object.objectType}`);
-        console.log(`  └─ ID: ${object.objectId}`);
-      }
+    console.log('\n📋 Created Objects:');
+    printObjects.map((object: ObjectChange) => {
+      console.log(`  ├─ Type: ${object.objectType}`);
+      console.log(`  └─ ID: ${object.objectId}`);
     });
 
-    saveContractData(
+    await saveContractData(
       dubheConfig.name,
       network,
       packageId,
-      schemaId,
+      dappHub,
       upgradeCapId,
       version,
-      schemas
+      components
     );
+
+    await saveMetadata(dubheConfig.name, network, packageId);
+
+    // Insert package id to dubhe config
+    let config = JSON.parse(fs.readFileSync(`${process.cwd()}/dubhe.config.json`, 'utf-8'));
+    config.package_id = packageId;
+    fs.writeFileSync(`${process.cwd()}/dubhe.config.json`, JSON.stringify(config, null, 2));
+
     console.log('\n✅ Contract Publication Complete\n');
   } else {
     console.log(chalk.yellow('  └─ Deploy hook execution failed'));
@@ -460,15 +321,13 @@ async function checkDubheFramework(projectPath: string): Promise<boolean> {
     console.log(chalk.yellow('\nℹ️ Dubhe Framework Files Not Found'));
     console.log(chalk.yellow('  ├─ Expected Path:'), projectPath);
     console.log(chalk.yellow('  ├─ To set up Dubhe Framework:'));
-    console.log(chalk.yellow('  │  1. Create directory: mkdir -p contracts/dubhe-framework'));
+    console.log(chalk.yellow('  │  1. Create directory: mkdir -p contracts/dubhe'));
     console.log(
       chalk.yellow(
-        '  │  2. Clone repository: git clone https://github.com/0xobelisk/dubhe-framework contracts/dubhe-framework'
+        '  │  2. Clone repository: git clone https://github.com/0xobelisk/dubhe contracts/dubhe'
       )
     );
-    console.log(
-      chalk.yellow('  │  3. Or download from: https://github.com/0xobelisk/dubhe-framework')
-    );
+    console.log(chalk.yellow('  │  3. Or download from: https://github.com/0xobelisk/dubhe'));
     console.log(chalk.yellow('  └─ After setup, restart the local node'));
     return false;
   }
@@ -480,7 +339,7 @@ export async function publishDubheFramework(
   network: 'mainnet' | 'testnet' | 'devnet' | 'localnet'
 ) {
   const path = process.cwd();
-  const projectPath = `${path}/contracts/dubhe-framework`;
+  const projectPath = `${path}/src/dubhe`;
 
   if (!(await checkDubheFramework(projectPath))) {
     return;
@@ -492,57 +351,22 @@ export async function publishDubheFramework(
   const chainId = await waitForNode(dubhe);
 
   await removeEnvContent(`${projectPath}/Move.lock`, network);
+  await updateMoveTomlAddress(projectPath, "0x0");
+
   const [modules, dependencies] = buildContract(projectPath);
   const tx = new Transaction();
   const [upgradeCap] = tx.publish({ modules, dependencies });
   tx.transferObjects([upgradeCap], dubhe.getAddress());
 
-  let result: any = null;
-  let retryCount = 0;
-  let spinnerIndex = 0;
-  const startTime = Date.now();
-  let isInterrupted = false;
-
-  const handleInterrupt = () => {
-    isInterrupted = true;
-    process.stdout.write('\r' + ' '.repeat(50) + '\r');
-    console.log('\n  └─ Operation cancelled by user');
-    process.exit(0);
-  };
-  process.on('SIGINT', handleInterrupt);
-
+  let result;
   try {
-    while (retryCount < MAX_RETRIES && !result && !isInterrupted) {
-      try {
-        result = await dubhe.signAndSendTxn({ tx });
-      } catch (error) {
-        if (isInterrupted) break;
-
-        retryCount++;
-        if (retryCount === MAX_RETRIES) {
-          console.log(chalk.red(`  └─ Publication failed after ${MAX_RETRIES} attempts`));
-          console.log(chalk.red('  └─ Please check your network connection and try again later.'));
-          process.exit(1);
-        }
-
-        const elapsedTime = Math.floor((Date.now() - startTime) / 1000);
-        const spinner = SPINNER[spinnerIndex % SPINNER.length];
-        spinnerIndex++;
-
-        process.stdout.write(`\r  ├─ ${spinner} Retrying... (${elapsedTime}s)`);
-        await new Promise((resolve) => setTimeout(resolve, RETRY_INTERVAL));
-      }
-    }
-  } finally {
-    process.removeListener('SIGINT', handleInterrupt);
-  }
-
-  if (isInterrupted) {
-    process.exit(0);
+    result = await dubhe.signAndSendTxn({ tx });
+  } catch (error: any) {
+    console.error(chalk.red('  └─ Publication failed'));
+    console.error(error.message);
+    process.exit(1);
   }
 
-  process.stdout.write('\r' + ' '.repeat(50) + '\r');
-
   if (!result || result.effects?.status.status === 'failure') {
     console.log(chalk.red('  └─ Publication failed'));
     process.exit(1);
@@ -550,8 +374,8 @@ export async function publishDubheFramework(
 
   let version = 1;
   let packageId = '';
-  let schemaId = '';
-  let schemas: Record<string, string> = {};
+  let dappHub = '';
+  let components = {};
   let upgradeCapId = '';
 
   result.objectChanges!.map((object: ObjectChange) => {
@@ -565,14 +389,20 @@ export async function publishDubheFramework(
     ) {
       upgradeCapId = object.objectId || '';
     }
+    if (
+      object.type === 'created' &&
+      object.objectType &&
+      object.objectType.includes('dapp_hub::DappHub')
+    ) {
+      dappHub = object.objectId || '';
+    }
   });
 
   await delay(3000);
-
   const deployHookTx = new Transaction();
   deployHookTx.moveCall({
     target: `${packageId}::dubhe_genesis::run`,
-    arguments: [deployHookTx.object('0x6')]
+    arguments: [deployHookTx.object(dappHub), deployHookTx.object('0x6')]
   });
 
   let deployHookResult;
@@ -584,22 +414,14 @@ export async function publishDubheFramework(
     process.exit(1);
   }
 
-  if (deployHookResult.effects?.status.status === 'success') {
-    deployHookResult.objectChanges?.map((object: ObjectChange) => {
-      if (
-        object.type === 'created' &&
-        object.objectType &&
-        object.objectType.includes('dubhe_schema::Schema')
-      ) {
-        schemaId = object.objectId || '';
-      }
-    });
+  if (deployHookResult.effects?.status.status !== 'success') {
+    throw new Error('Deploy hook execution failed');
   }
 
-  saveContractData('dubhe-framework', network, packageId, schemaId, upgradeCapId, version, schemas);
+  await updateMoveTomlAddress(projectPath, packageId);
+  await saveContractData('dubhe', network, packageId, dappHub, upgradeCapId, version, components);
 
   updateEnvFile(`${projectPath}/Move.lock`, network, 'publish', chainId, packageId);
-  await delay(1000);
 }
 
 export async function publishHandler(
@@ -613,12 +435,15 @@ export async function publishHandler(
     network
   });
 
-  if (network === 'localnet') {
+  const path = process.cwd();
+  const projectPath = `${path}/src/${dubheConfig.name}`;
+
+  if (network === 'localnet' && dubheConfig.name !== 'dubhe') {
     await publishDubheFramework(dubhe, network);
   }
 
-  const path = process.cwd();
-  const projectPath = `${path}/contracts/${dubheConfig.name}`;
-  await updateDubheDependency(`${projectPath}/Move.toml`, network);
+  if (dubheConfig.name !== 'dubhe') {
+    await updateDubheDependency(`${projectPath}/Move.toml`, network);
+  }
   await publishContract(dubhe, dubheConfig, network, projectPath, gasBudget);
 }