@0xobelisk/sui-cli 1.2.0-pre.120 → 1.2.0-pre.122

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xobelisk/sui-cli",
-  "version": "1.2.0-pre.120",
+  "version": "1.2.0-pre.122",
   "description": "Tookit for interacting with move eps framework",
   "keywords": [
     "sui",
@@ -47,8 +47,8 @@
     "yargs": "^17.7.1",
     "zod": "^3.22.3",
     "zod-validation-error": "^1.3.0",
-    "@0xobelisk/sui-client": "1.2.0-pre.120",
-    "@0xobelisk/sui-common": "1.2.0-pre.120"
+    "@0xobelisk/sui-client": "1.2.0-pre.122",
+    "@0xobelisk/sui-common": "1.2.0-pre.122"
   },
   "devDependencies": {
     "@types/cli-progress": "^3.11.5",

package/src/commands/convertJson.ts

@@ -15,7 +15,8 @@ const RUNTIME_FIELDS = [
   'dubhe_object_id',
   'original_dubhe_package_id',
   'dapp_key',
-  'start_checkpoint'
+  'start_checkpoint',
+  'package_ids'
 ];
 
 export function mergeConfigJsonRuntimeFields(
@@ -45,7 +46,7 @@ const commandModule: CommandModule<Options, Options> = {
       'config-path': {
         type: 'string',
         default: 'dubhe.config.ts',
-        description: 'Options to pass to forge test'
+        description: 'Path to the Dubhe config file'
       },
       'output-path': {
         type: 'string',
@@ -62,7 +63,8 @@ const commandModule: CommandModule<Options, Options> = {
       const schemaJson = JSON.parse(generateConfigJson(dubheConfig));
 
       let existing: Record<string, unknown> = {};
-      if (fs.existsSync(outputPath)) {
+      const isUpdate = fs.existsSync(outputPath);
+      if (isUpdate) {
         try {
           existing = JSON.parse(fs.readFileSync(outputPath, 'utf-8'));
         } catch {
@@ -71,10 +73,17 @@ const commandModule: CommandModule<Options, Options> = {
       }
       const merged = mergeConfigJsonRuntimeFields(schemaJson, existing);
 
+      // Log which runtime fields were preserved from the existing file
+      const preserved = RUNTIME_FIELDS.filter((f) => existing[f] !== undefined);
+      if (preserved.length > 0) {
+        console.log(chalk.gray(`   preserved runtime fields: ${preserved.join(', ')}`));
+      }
+
       fs.writeFileSync(outputPath, JSON.stringify(merged, null, 2));
+      console.log(chalk.green(`✅ ${isUpdate ? 'Updated' : 'Created'} ${outputPath}`));
     } catch (error: any) {
       console.error(chalk.red('Error executing convert json:'));
-      console.log(error.stdout);
+      if (error.message) console.error(error.message);
       handlerExit(1);
     }
     handlerExit();

package/src/commands/storeConfig.ts

@@ -30,6 +30,7 @@ const commandModule: CommandModule<Options, Options> = {
     },
     'output-ts-path': {
       type: 'string',
+      default: './deployment.ts',
       desc: 'Specify the output path for the generated TypeScript configuration file (e.g., ./src/config/generated.ts)'
     }
   },

package/src/utils/publishHandler.ts

@@ -521,12 +521,20 @@ async function publishContract(
     // Insert package id to dubhe config
     let config = JSON.parse(fs.readFileSync(`${process.cwd()}/dubhe.config.json`, 'utf-8'));
     config.original_package_id = packageId;
+    // Initialize the trusted package address list. The indexer uses this list to verify
+    // event.type_.address so that forged events from other contracts are rejected even
+    // when they embed the same dapp_key string.
+    config.package_ids = [packageId];
     config.dubhe_object_id = frameworkDappHubId;
     // When deploying the dubhe framework itself, the "original dubhe package ID" is
     // the package we just published. For user packages, look up the well-known
     // framework address for the target network from the client config.
-    config.original_dubhe_package_id =
-      dubheConfig.name === 'dubhe' ? packageId : await getOriginalDubhePackageId(network);
+    // devnet has no fixed framework deployment so we skip this field.
+    if (dubheConfig.name === 'dubhe') {
+      config.original_dubhe_package_id = packageId;
+    } else if (network !== 'devnet') {
+      config.original_dubhe_package_id = await getOriginalDubhePackageId(network);
+    }
     config.start_checkpoint = startCheckpoint;
     // Canonical dapp_key type string: stable across upgrades, no "0x" prefix, padded to 64 hex chars.
     // Matches the Move type_name::with_defining_ids<DappKey>().into_string() format.

package/src/utils/storeConfig.ts

@@ -23,17 +23,17 @@ async function storeConfig(
 
   // Mirror getDubheDappHubId: for localnet the framework is deployed ephemerally so we
   // read its package ID from src/dubhe/.history/sui_localnet/latest.json.
-  // For testnet/mainnet the SDK resolves the framework address automatically via
-  // getDefaultConfig(), so we emit undefined.
+  // For testnet/mainnet the hardcoded ID from @0xobelisk/sui-client defaultConfig is used.
+  // devnet has no fixed framework deployment, so frameworkPackageId stays undefined.
   let frameworkPackageId: string | undefined;
-  if (network === 'localnet') {
+  if (network !== 'devnet') {
     frameworkPackageId = await getOriginalDubhePackageId(network);
   }
 
   const frameworkIdLine =
     frameworkPackageId !== undefined
       ? `\n// Published package ID of the dubhe framework — required for proxy operations.\nexport const FrameworkPackageId: string | undefined = '${frameworkPackageId}';\n`
-      : `\n// Published package ID of the dubhe framework — required for proxy operations.\n// For testnet/mainnet the SDK resolves this automatically via getDefaultConfig().\nexport const FrameworkPackageId: string | undefined = undefined;\n`;
+      : `\n// Published package ID of the dubhe framework — required for proxy operations.\n// Not available for devnet (no fixed framework deployment).\nexport const FrameworkPackageId: string | undefined = undefined;\n`;
 
   const dappKey = buildDappKey(originalPackageId);
 

package/src/utils/upgradeHandler.ts

@@ -22,7 +22,8 @@ import {
   readPublishedToml,
   updateEphemeralPubFile,
   getEphemeralPubFilePath,
-  updateMoveTomlAddress
+  updateMoveTomlAddress,
+  appendPackageIdToConfig
 } from './utils';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -302,6 +303,14 @@ export async function upgradeHandler(
       dappStorageId || undefined
     );
 
+    // Append the new package ID to dubhe.config.json so the indexer can verify
+    // event.type_.address against all known package versions on next startup.
+    const configJsonPath = `${process.cwd()}/dubhe.config.json`;
+    appendPackageIdToConfig(configJsonPath, newPackageId);
+    if (fs.existsSync(configJsonPath)) {
+      console.log(chalk.green(`✅ Appended ${newPackageId} to dubhe.config.json package_ids`));
+    }
+
     // Only run the migration transaction if there are pending schema changes or a
     // forced version bump was requested via --bump-version.
     // A pure "bug-fix" upgrade with no new fields and no --bump-version flag does

package/src/utils/utils.ts

@@ -1234,3 +1234,19 @@ export function confirm(question: string): Promise<boolean> {
     });
   });
 }
+
+/**
+ * Append a new package ID to the `package_ids` array in dubhe.config.json.
+ * Idempotent — does nothing if the ID is already present or the file does not exist.
+ * Called by upgradeHandler after a successful on-chain upgrade so the indexer
+ * can verify event.type_.address against all known package versions on next startup.
+ */
+export function appendPackageIdToConfig(configJsonPath: string, newPackageId: string): void {
+  if (!fs.existsSync(configJsonPath)) return;
+  const configJson = JSON.parse(fs.readFileSync(configJsonPath, 'utf-8'));
+  const existingIds: string[] = Array.isArray(configJson.package_ids) ? configJson.package_ids : [];
+  if (!existingIds.includes(newPackageId)) {
+    configJson.package_ids = [...existingIds, newPackageId];
+    fs.writeFileSync(configJsonPath, JSON.stringify(configJson, null, 2));
+  }
+}