@0xobelisk/sui-cli 1.2.0-pre.123 → 1.2.0-pre.125

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@0xobelisk/sui-cli",
-  "version": "1.2.0-pre.123",
+  "version": "1.2.0-pre.125",
   "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.123",
-    "@0xobelisk/sui-common": "1.2.0-pre.123"
+    "@0xobelisk/sui-client": "1.2.0-pre.125",
+    "@0xobelisk/sui-common": "1.2.0-pre.125"
   },
   "devDependencies": {
     "@types/cli-progress": "^3.11.5",

package/src/utils/publishHandler.ts

@@ -16,7 +16,8 @@ import {
   getEphemeralPubFilePath,
   getPublishedTomlEntry,
   clearPublishedTomlEntry,
-  restorePublishedTomlEntry
+  restorePublishedTomlEntry,
+  removeEnvFromMoveLock
 } from './utils';
 import { DubheConfig } from '@0xobelisk/sui-common';
 import * as fs from 'fs';
@@ -48,116 +49,6 @@ function patchMoveTomlWithLocalnetEnv(moveTomlPath: string, chainId: string): st
   return content;
 }
 
-async function removeEnvContent(
-  filePath: string,
-  networkType: 'mainnet' | 'testnet' | 'devnet' | 'localnet'
-): Promise<void> {
-  if (!fs.existsSync(filePath)) {
-    return;
-  }
-  const content = fs.readFileSync(filePath, 'utf-8');
-  const regex = new RegExp(`\\[env\\.${networkType}\\][\\s\\S]*?(?=\\[|$)`, 'g');
-  const updatedContent = content.replace(regex, '');
-  fs.writeFileSync(filePath, updatedContent, 'utf-8');
-}
-
-interface EnvConfig {
-  chainId: string;
-  originalPublishedId: string;
-  latestPublishedId: string;
-  publishedVersion: number;
-}
-
-function updateEnvFile(
-  filePath: string,
-  networkType: 'mainnet' | 'testnet' | 'devnet' | 'localnet',
-  operation: 'publish' | 'upgrade',
-  chainId: string,
-  publishedId: string
-): void {
-  const envFilePath = path.resolve(filePath);
-  const envContent = fs.readFileSync(envFilePath, 'utf-8');
-  const envLines = envContent.split('\n');
-
-  const networkSectionIndex = envLines.findIndex((line) => line.trim() === `[env.${networkType}]`);
-  const config: EnvConfig = {
-    chainId: chainId,
-    originalPublishedId: '',
-    latestPublishedId: '',
-    publishedVersion: 0
-  };
-
-  if (networkSectionIndex === -1) {
-    // If network section is not found, add a new section
-    if (operation === 'publish') {
-      config.originalPublishedId = publishedId;
-      config.latestPublishedId = publishedId;
-      config.publishedVersion = 1;
-    } else {
-      throw new Error(
-        `Network type [env.${networkType}] not found in the file and cannot upgrade.`
-      );
-    }
-  } else {
-    for (let i = networkSectionIndex + 1; i < envLines.length; i++) {
-      const line = envLines[i].trim();
-      if (line.startsWith('[')) break; // End of the current network section
-
-      const [key, value] = line.split('=').map((part) => part.trim().replace(/"/g, ''));
-      switch (key) {
-        case 'original-published-id':
-          config.originalPublishedId = value;
-          break;
-        case 'latest-published-id':
-          config.latestPublishedId = value;
-          break;
-        case 'published-version':
-          config.publishedVersion = parseInt(value, 10);
-          break;
-      }
-    }
-
-    if (operation === 'publish') {
-      config.originalPublishedId = publishedId;
-      config.latestPublishedId = publishedId;
-      config.publishedVersion = 1;
-    } else if (operation === 'upgrade') {
-      config.latestPublishedId = publishedId;
-      config.publishedVersion += 1;
-    }
-  }
-
-  const updatedSection = `
-[env.${networkType}]
-chain-id = "${config.chainId}"
-original-published-id = "${config.originalPublishedId}"
-latest-published-id = "${config.latestPublishedId}"
-published-version = "${config.publishedVersion}"
-`;
-
-  const newEnvContent =
-    networkSectionIndex === -1
-      ? envContent + updatedSection
-      : envLines.slice(0, networkSectionIndex).join('\n') + updatedSection;
-
-  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] : '';
-// }
-
 /**
  * Build a Move package and return [modules, dependencies] as base64 arrays.
  *
@@ -258,7 +149,7 @@ async function publishContract(
   const chainId = await waitForNode(dubhe);
   console.log('  ├─ Validating Environment...');
 
-  await removeEnvContent(`${projectPath}/Move.lock`, network);
+  removeEnvFromMoveLock(`${projectPath}/Move.lock`, network);
   console.log(`  └─ Account: ${dubhe.getAddress()}`);
 
   // Ensure src/dubhe/Published.toml references the canonical framework address
@@ -442,7 +333,6 @@ async function publishContract(
 
   console.log(`  └─ Transaction: ${result.digest}`);
 
-  updateEnvFile(`${projectPath}/Move.lock`, network, 'publish', chainId, packageId);
   updatePublishedToml(projectPath, network, chainId, packageId, packageId, 1);
 
   console.log('\n⚡ Executing Deploy Hook...');
@@ -588,14 +478,14 @@ export async function publishDubheFramework(
 
   const chainId = await waitForNode(dubhe);
 
-  await removeEnvContent(`${projectPath}/Move.lock`, network);
+  removeEnvFromMoveLock(`${projectPath}/Move.lock`, network);
   if (network === 'localnet') {
     // When building with --build-env testnet, Sui CLI reads Move.lock's [env.testnet] section
     // and bakes its original-published-id (non-zero for a previously published dubhe) into the
     // bytecode as the package self-address. Publishing then fails with PublishErrorNonZeroAddress
     // because Sui requires the self-address to be 0x0 for a first-time publish.
     // Fix: clear the testnet env section before building so the CLI uses 0x0 from Move.toml.
-    await removeEnvContent(`${projectPath}/Move.lock`, 'testnet');
+    removeEnvFromMoveLock(`${projectPath}/Move.lock`, 'testnet');
   }
   await updateMoveTomlAddress(projectPath, '0x0');
 
@@ -715,7 +605,6 @@ export async function publishDubheFramework(
     network === 'localnet' ? packageId : undefined
   );
 
-  updateEnvFile(`${projectPath}/Move.lock`, network, 'publish', chainId, packageId);
   updatePublishedToml(projectPath, network, chainId, packageId, packageId, 1);
 
   // For localnet: write dubhe's published address to Pub.localnet.toml so that

package/src/utils/upgradeHandler.ts

@@ -23,10 +23,10 @@ import {
   updateEphemeralPubFile,
   getEphemeralPubFilePath,
   updateMoveTomlAddress,
-  appendPackageIdToConfig
+  appendPackageIdToConfig,
+  removeEnvFromMoveLock
 } from './utils';
 import * as fs from 'fs';
-import * as path from 'path';
 import { DubheConfig } from '@0xobelisk/sui-common';
 
 type Migration = {
@@ -34,46 +34,6 @@ type Migration = {
   fields: any;
 };
 
-function replaceEnvField(
-  filePath: string,
-  networkType: 'mainnet' | 'testnet' | 'devnet' | 'localnet',
-  field: 'original-published-id' | 'latest-published-id' | 'published-version',
-  newValue: string
-): string {
-  const envFilePath = path.resolve(filePath);
-  const envContent = fs.readFileSync(envFilePath, 'utf-8');
-  const envLines = envContent.split('\n');
-
-  const networkSectionIndex = envLines.findIndex((line) => line.trim() === `[env.${networkType}]`);
-  if (networkSectionIndex === -1) {
-    console.log(`Network type [env.${networkType}] not found in the file.`);
-    return '';
-  }
-
-  let fieldIndex = -1;
-  let previousValue: string = '';
-  for (let i = networkSectionIndex + 1; i < envLines.length; i++) {
-    const line = envLines[i].trim();
-    if (line.startsWith('[')) break; // End of the current network section
-
-    if (line.startsWith(field)) {
-      fieldIndex = i;
-      previousValue = line.split('=')[1].trim().replace(/"/g, '');
-      break;
-    }
-  }
-
-  if (fieldIndex !== -1) {
-    envLines[fieldIndex] = `${field} = "${newValue}"`;
-    const newEnvContent = envLines.join('\n');
-    fs.writeFileSync(envFilePath, newEnvContent, 'utf-8');
-  } else {
-    console.log(`${field} not found for [env.${networkType}].`);
-  }
-
-  return previousValue;
-}
-
 export async function upgradeHandler(
   config: DubheConfig,
   name: string,
@@ -119,12 +79,11 @@ export async function upgradeHandler(
     appendMigrateFunction(projectPath, config.name, oldVersion + 1);
   }
 
-  const original_published_id = replaceEnvField(
-    `${projectPath}/Move.lock`,
-    network,
-    'original-published-id',
-    '0x0000000000000000000000000000000000000000000000000000000000000000'
-  );
+  // Read original_published_id from Published.toml before clearing it.
+  // Published.toml is the canonical source of truth for deployed addresses;
+  // Move.lock [env.*] is owned by the Sui CLI and must not be read or written
+  // by our toolchain.
+  const original_published_id = readPublishedToml(projectPath)[network]?.originalId ?? '';
 
   // For persistent networks (testnet/mainnet): zero out Published.toml so the
   // package compiles with address 0x0 for upgrade.
@@ -133,6 +92,12 @@ export async function upgradeHandler(
   const savedPublishedEntry =
     network !== 'localnet' ? clearPublishedTomlEntry(projectPath, network) : undefined;
 
+  // Clear Move.lock [env.*] so the Sui CLI does not pick up a stale non-zero
+  // address and fail with PublishErrorNonZeroAddress during build.
+  // We intentionally do NOT write it back afterwards — Published.toml is the
+  // source of truth and the Sui CLI will regenerate the lock section if needed.
+  removeEnvFromMoveLock(`${projectPath}/Move.lock`, network);
+
   // For testnet/mainnet: auto-sync src/dubhe/Published.toml to the canonical
   // framework address from the SDK before building.  Prevents
   // VMVerificationOrDeserializationError when the framework was redeployed
@@ -265,15 +230,6 @@ export async function upgradeHandler(
       }
     });
 
-    replaceEnvField(
-      `${projectPath}/Move.lock`,
-      network,
-      'original-published-id',
-      original_published_id
-    );
-    replaceEnvField(`${projectPath}/Move.lock`, network, 'latest-published-id', newPackageId);
-    replaceEnvField(`${projectPath}/Move.lock`, network, 'published-version', oldVersion + 1 + '');
-
     // Update Published.toml with the new package ID after upgrade.
     // For localnet: savedPublishedEntry is undefined (we skip clearPublishedTomlEntry),
     // so fall back to reading the current Published.toml entry for chainId/originalId.

package/src/utils/utils.ts

@@ -1250,3 +1250,23 @@ export function appendPackageIdToConfig(configJsonPath: string, newPackageId: st
     fs.writeFileSync(configJsonPath, JSON.stringify(configJson, null, 2));
   }
 }
+
+/**
+ * Strip the [env.<network>] section from a Move.lock file before a build.
+ *
+ * Move.lock is owned by the Sui CLI and should never be written by our CLI.
+ * We only remove stale [env.*] entries so the Sui CLI does not pick up an
+ * old non-zero address and fail with PublishErrorNonZeroAddress. After the
+ * publish/upgrade the entry is intentionally left absent — Published.toml is
+ * the canonical source of truth for deployed addresses across our toolchain.
+ */
+export function removeEnvFromMoveLock(
+  filePath: string,
+  networkType: 'mainnet' | 'testnet' | 'devnet' | 'localnet'
+): void {
+  if (!fs.existsSync(filePath)) return;
+  const content = fs.readFileSync(filePath, 'utf-8');
+  const regex = new RegExp(`\\[env\\.${networkType}\\][\\s\\S]*?(?=\\[|$)`, 'g');
+  const updated = content.replace(regex, '');
+  fs.writeFileSync(filePath, updated, 'utf-8');
+}