@0xobelisk/sui-cli 0.5.7 → 0.5.9

package/src/utils/utils.ts

@@ -1,153 +1,163 @@
-import * as fsAsync from "fs/promises";
-import { mkdirSync, writeFileSync } from "fs";
-import { dirname } from "path";
-import { FsIibError } from "./errors";
+import * as fsAsync from 'fs/promises';
+import { mkdirSync, writeFileSync } from 'fs';
+import { dirname } from 'path';
+import {
+	SUI_PRIVATE_KEY_PREFIX,
+	decodeSuiPrivateKey,
+} from '@mysten/sui.js/cryptography';
+import { FsIibError } from './errors';
 
 export type DeploymentJsonType = {
-  projectName: string;
-  network: "mainnet" | "testnet" | "devnet" | "localnet";
-  packageId: string;
-  worldId: string;
-  upgradeCap: string;
-  adminCap: string;
-  version: number;
+	projectName: string;
+	network: 'mainnet' | 'testnet' | 'devnet' | 'localnet';
+	packageId: string;
+	worldId: string;
+	upgradeCap: string;
+	adminCap: string;
+	version: number;
 };
 
-export function validatePrivateKey(privateKey: string): boolean | string {
-  if (privateKey.startsWith("0x")) {
-    const strippedPrivateKey = privateKey.slice(2);
-    if (strippedPrivateKey.length === 64) {
-      return strippedPrivateKey;
-    } else {
-      return false;
-    }
-  } else {
-    if (privateKey.length === 64) {
-      return privateKey;
-    } else {
-      return false;
-    }
-  }
+export function validatePrivateKey(privateKey: string): false | string {
+	if (privateKey.startsWith(SUI_PRIVATE_KEY_PREFIX)) {
+		if (privateKey.length === 70) {
+			return privateKey;
+		} else {
+			return false;
+		}
+	} else if (privateKey.startsWith('0x')) {
+		const strippedPrivateKey = privateKey.slice(2);
+		if (strippedPrivateKey.length === 64) {
+			return strippedPrivateKey;
+		} else {
+			return false;
+		}
+	} else {
+		if (privateKey.length === 64) {
+			return privateKey;
+		} else {
+			return false;
+		}
+	}
 }
 
 export async function updateVersionInFile(
-  projectPath: string,
-  newVersion: string
+	projectPath: string,
+	newVersion: string
 ) {
-  try {
-    const filePath = `${projectPath}/sources/codegen/eps/world.move`;
-    const data = await fsAsync.readFile(filePath, "utf8");
-
-    // update version data
-    const updatedData = data.replace(
-      /const VERSION: u64 = \d+;/,
-      `const VERSION: u64 = ${newVersion};`
-    );
-
-    // write new version
-    writeOutput(updatedData, filePath, "Update package version");
-  } catch {
-    throw new FsIibError("Fs update version failed.");
-  }
+	try {
+		const filePath = `${projectPath}/sources/codegen/eps/world.move`;
+		const data = await fsAsync.readFile(filePath, 'utf8');
+
+		// update version data
+		const updatedData = data.replace(
+			/const VERSION: u64 = \d+;/,
+			`const VERSION: u64 = ${newVersion};`
+		);
+
+		// write new version
+		writeOutput(updatedData, filePath, 'Update package version');
+	} catch {
+		throw new FsIibError('Fs update version failed.');
+	}
 }
 
 async function getDeploymentJson(projectPath: string, network: string) {
-  try {
-    const data = await fsAsync.readFile(
-      `${projectPath}/.history/sui_${network}/latest.json`,
-      "utf8"
-    );
-    return JSON.parse(data) as DeploymentJsonType;
-  } catch {
-    throw new FsIibError("Fs read deployment file failed.");
-  }
+	try {
+		const data = await fsAsync.readFile(
+			`${projectPath}/.history/sui_${network}/latest.json`,
+			'utf8'
+		);
+		return JSON.parse(data) as DeploymentJsonType;
+	} catch {
+		throw new FsIibError('Fs read deployment file failed.');
+	}
 }
 
 export async function getVersion(
-  projectPath: string,
-  network: string
+	projectPath: string,
+	network: string
 ): Promise<number> {
-  const deployment = await getDeploymentJson(projectPath, network);
-  return deployment.version;
+	const deployment = await getDeploymentJson(projectPath, network);
+	return deployment.version;
 }
 
 export async function getNetwork(
-  projectPath: string,
-  network: string
-): Promise<"mainnet" | "testnet" | "devnet" | "localnet"> {
-  const deployment = await getDeploymentJson(projectPath, network);
-  return deployment.network;
+	projectPath: string,
+	network: string
+): Promise<'mainnet' | 'testnet' | 'devnet' | 'localnet'> {
+	const deployment = await getDeploymentJson(projectPath, network);
+	return deployment.network;
 }
 
 export async function getOldPackageId(
-  projectPath: string,
-  network: string
+	projectPath: string,
+	network: string
 ): Promise<string> {
-  const deployment = await getDeploymentJson(projectPath, network);
-  return deployment.packageId;
+	const deployment = await getDeploymentJson(projectPath, network);
+	return deployment.packageId;
 }
 
 export async function getWorldId(
-  projectPath: string,
-  network: string
+	projectPath: string,
+	network: string
 ): Promise<string> {
-  const deployment = await getDeploymentJson(projectPath, network);
-  return deployment.worldId;
+	const deployment = await getDeploymentJson(projectPath, network);
+	return deployment.worldId;
 }
 
 export async function getUpgradeCap(
-  projectPath: string,
-  network: string
+	projectPath: string,
+	network: string
 ): Promise<string> {
-  const deployment = await getDeploymentJson(projectPath, network);
-  return deployment.upgradeCap;
+	const deployment = await getDeploymentJson(projectPath, network);
+	return deployment.upgradeCap;
 }
 
 export async function getAdminCap(
-    projectPath: string,
-    network: string
+	projectPath: string,
+	network: string
 ): Promise<string> {
-  const deployment = await getDeploymentJson(projectPath, network);
-  return deployment.adminCap;
+	const deployment = await getDeploymentJson(projectPath, network);
+	return deployment.adminCap;
 }
 
 export function saveContractData(
-  projectName: string,
-  network: "mainnet" | "testnet" | "devnet" | "localnet",
-  packageId: string,
-  worldId: string,
-  upgradeCap: string,
-  adminCap: string,
-  version: number
+	projectName: string,
+	network: 'mainnet' | 'testnet' | 'devnet' | 'localnet',
+	packageId: string,
+	worldId: string,
+	upgradeCap: string,
+	adminCap: string,
+	version: number
 ) {
-  const DeploymentData: DeploymentJsonType = {
-    projectName,
-    network,
-    packageId,
-    worldId,
-    upgradeCap,
-    adminCap,
-    version,
-  };
-
-  const path = process.cwd();
-  const storeDeploymentData = JSON.stringify(DeploymentData, null, 2);
-  writeOutput(
-    storeDeploymentData,
-    `${path}/contracts/${projectName}/.history/sui_${network}/latest.json`,
-    "Update deploy log"
-  );
+	const DeploymentData: DeploymentJsonType = {
+		projectName,
+		network,
+		packageId,
+		worldId,
+		upgradeCap,
+		adminCap,
+		version,
+	};
+
+	const path = process.cwd();
+	const storeDeploymentData = JSON.stringify(DeploymentData, null, 2);
+	writeOutput(
+		storeDeploymentData,
+		`${path}/contracts/${projectName}/.history/sui_${network}/latest.json`,
+		'Update deploy log'
+	);
 }
 
 export async function writeOutput(
-  output: string,
-  fullOutputPath: string,
-  logPrefix?: string
+	output: string,
+	fullOutputPath: string,
+	logPrefix?: string
 ): Promise<void> {
-  mkdirSync(dirname(fullOutputPath), { recursive: true });
+	mkdirSync(dirname(fullOutputPath), { recursive: true });
 
-  writeFileSync(fullOutputPath, output);
-  if (logPrefix !== undefined) {
-    console.log(`${logPrefix}: ${fullOutputPath}`);
-  }
+	writeFileSync(fullOutputPath, output);
+	if (logPrefix !== undefined) {
+		console.log(`${logPrefix}: ${fullOutputPath}`);
+	}
 }