@beclab/olaresid 0.1.6 → 0.1.8

package/examples/generate-mnemonic.ts

@@ -21,7 +21,7 @@ async function example1_generateNew() {
 
 	// Generate a 12-word mnemonic
 	console.log('\n🔑 Generating 12-word mnemonic...');
-	const mnemonic12 = await generateMnemonic(12);
+	const mnemonic12 = generateMnemonic(12);
 	console.log(`Mnemonic: ${mnemonic12}`);
 
 	console.log('\n⏳ Deriving keys using Trust Wallet Core...');
@@ -35,7 +35,7 @@ async function example1_generateNew() {
 	// Generate a 24-word mnemonic
 	console.log('\n' + '-'.repeat(60));
 	console.log('\n🔑 Generating 24-word mnemonic...');
-	const mnemonic24 = await generateMnemonic(24);
+	const mnemonic24 = generateMnemonic(24);
 	console.log(`Mnemonic: ${mnemonic24}`);
 
 	console.log('\n⏳ Deriving keys...');
@@ -95,7 +95,7 @@ async function example4_parallelDerivation() {
 	console.log('Example 4: Parallel Key Derivation (Performance Test)');
 	console.log('='.repeat(60));
 
-	const mnemonic = await generateMnemonic(12);
+	const mnemonic = generateMnemonic(12);
 	console.log(`\n📝 Mnemonic: ${mnemonic}`);
 
 	console.log('\n⏳ Deriving owner and DID in parallel...');

package/examples/register-subdomain.ts

@@ -79,7 +79,7 @@ async function main() {
 	console.log('\n📝 Step 4: Generate Mnemonic for Subdomain');
 	console.log('-'.repeat(60));
 
-	const mnemonic = await generateMnemonic(12);
+	const mnemonic = generateMnemonic(12);
 	console.log('✅ Generated 12-word mnemonic:');
 	console.log(`   ${mnemonic}`);
 	console.log(

package/examples/transfer-domain.ts

@@ -98,7 +98,7 @@ async function main() {
 		mnemonic = process.env.NEW_OWNER_MNEMONIC;
 		console.log('📝 Using provided mnemonic');
 	} else {
-		mnemonic = await generateMnemonic(12);
+		mnemonic = generateMnemonic(12);
 		console.log('🔑 Generated 12-word mnemonic:');
 		console.log(`   ${mnemonic}`);
 		console.log(

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@beclab/olaresid",
-    "version": "0.1.6",
+    "version": "0.1.8",
     "description": "DID Contract SDK with CLI tool",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -39,6 +39,7 @@
     "dependencies": {
         "@solana/web3.js": "^1.87.6",
         "@trustwallet/wallet-core": "^3.2.9",
+        "bip39": "^3.1.0",
         "ethers": "^6.9.1",
         "multiformats": "9.6.4",
         "tweetnacl": "^1.0.3",

package/src/business/index.ts

@@ -4,12 +4,6 @@ import { parseContractError } from '../utils/error-parser';
 import { TagContext } from './tag-context';
 import { TagTypeBuilder } from '../utils/tag-type-builder';
 import { normalizeToDomain } from '../utils/olares-id';
-import {
-	base64ToUint8Array,
-	uint8ArrayToHex,
-	hexToUint8Array,
-	uint8ArrayToBase64
-} from '../utils/crypto-utils';
 
 export interface TransactionResult<T = any> {
 	// Basic transaction information
@@ -54,11 +48,7 @@ export {
 	getDIDFromMnemonic,
 	generateDIDKeyData,
 	deriveDIDFromMnemonic,
-	getEd25519JwkFromMnemonic,
-	base64ToUint8Array,
-	uint8ArrayToHex,
-	hexToUint8Array,
-	uint8ArrayToBase64
+	getEd25519JwkFromMnemonic
 } from '../utils/crypto-utils';
 export type { RSAPublicKeyData, DIDKeyData } from '../utils/crypto-utils';
 
@@ -190,7 +180,7 @@ export class DomainContext {
 	 * ```typescript
 	 * // For parent domain "parent.com", register subdomain "child"
 	 * const parentDomain = olaresId.domain('parent.com');
-	 * const mnemonic = await generateMnemonic(12);
+	 * const mnemonic = generateMnemonic(12);
 	 *
 	 * const result = await parentDomain.registerSubdomain('child', mnemonic);
 	 * // This will register "child.parent.com"
@@ -276,7 +266,7 @@ export class DomainContext {
 	 *
 	 * @example
 	 * ```typescript
-	 * const mnemonic = await generateMnemonic(12);
+	 * const mnemonic = generateMnemonic(12);
 	 * const result = await domain.transfer(mnemonic);
 	 * if (result.success) {
 	 *   console.log('Domain transferred!');
@@ -871,7 +861,7 @@ export class DomainContext {
 			} catch {
 				// Try base64
 				try {
-					const secretKey = base64ToUint8Array(solanaPrivateKey);
+					const secretKey = Buffer.from(solanaPrivateKey, 'base64');
 					solanaWallet = Keypair.fromSecretKey(secretKey);
 				} catch {
 					// Try as JSON array
@@ -882,9 +872,9 @@ export class DomainContext {
 				}
 			}
 
-			// Get Solana address as bytes32 (cross-platform)
+			// Get Solana address as bytes32
 			const solanaAddressBytes =
-				'0x' + uint8ArrayToHex(solanaWallet.publicKey.toBytes());
+				'0x' + solanaWallet.publicKey.toBuffer().toString('hex');
 
 			// Get current timestamp
 			const signAt = Math.floor(Date.now() / 1000) - 30 * 60; // 30 minutes ago
@@ -944,8 +934,8 @@ export class DomainContext {
 				decodeUTF8(solanaMsg),
 				solanaWallet.secretKey
 			);
-			// Convert signature to hex (cross-platform)
-			const sigFromAuthAddrHex = '0x' + uint8ArrayToHex(sigFromAuthAddr);
+			const sigFromAuthAddrHex =
+				'0x' + Buffer.from(sigFromAuthAddr).toString('hex');
 
 			// Call contract
 			const tx = await rootTagger.updateSolanaWallet(
@@ -1008,7 +998,7 @@ export class DomainContext {
 			} catch {
 				// Try base64
 				try {
-					const secretKey = base64ToUint8Array(solanaPrivateKey);
+					const secretKey = Buffer.from(solanaPrivateKey, 'base64');
 					solanaWallet = Keypair.fromSecretKey(secretKey);
 				} catch {
 					// Try as JSON array
@@ -1019,9 +1009,9 @@ export class DomainContext {
 				}
 			}
 
-			// Get Solana address as bytes32 (cross-platform)
+			// Get Solana address as bytes32
 			const solanaAddressBytes =
-				'0x' + uint8ArrayToHex(solanaWallet.publicKey.toBytes());
+				'0x' + solanaWallet.publicKey.toBuffer().toString('hex');
 
 			// Get current timestamp
 			const signAt = Math.floor(Date.now() / 1000) - 30 * 60; // 30 minutes ago
@@ -1122,8 +1112,11 @@ export class DomainContext {
 			// Extract addresses from the result and convert to base58
 			// Result is array of { algorithm, addr } where addr is bytes32
 			return result.map((item: any) => {
-				// Convert hex to Uint8Array (cross-platform)
-				const buffer = hexToUint8Array(item.addr);
+				// Remove 0x prefix and convert hex to buffer
+				const hexStr = item.addr.startsWith('0x')
+					? item.addr.slice(2)
+					: item.addr;
+				const buffer = Buffer.from(hexStr, 'hex');
 				// Convert to Solana public key and then to base58
 				return new PublicKey(buffer).toBase58();
 			});
@@ -1438,16 +1431,13 @@ export function bytes4ToIpv4(bytes4Hex: string): string {
  */
 export function pemToDer(pem: string): string {
 	// Remove PEM headers, footers, and whitespace
-	const base64Str = pem
+	const base64 = pem
 		.replace(/-----BEGIN.*?-----/g, '')
 		.replace(/-----END.*?-----/g, '')
 		.replace(/\s/g, '');
 
-	// Convert base64 to Uint8Array using cross-platform method
-	const derBuffer = base64ToUint8Array(base64Str);
-
-	// Convert to hex string
-	const hexString = uint8ArrayToHex(derBuffer);
+	const derBuffer = Buffer.from(base64, 'base64');
+	const hexString = derBuffer.toString('hex');
 
 	// Convert to hex string with 0x prefix
 	return '0x' + hexString;
@@ -1462,14 +1452,13 @@ export function derToPem(derHex: string): string {
 	// Remove '0x' prefix if present
 	const hexString = derHex.startsWith('0x') ? derHex.slice(2) : derHex;
 
-	// Convert hex to base64 using cross-platform methods
-	const bytes = hexToUint8Array(hexString);
-	const base64Str = uint8ArrayToBase64(bytes);
+	const derBuffer = Buffer.from(hexString, 'hex');
+	const base64 = derBuffer.toString('base64');
 
 	// Split base64 into 64-character lines for PEM format
 	const lines: string[] = [];
-	for (let i = 0; i < base64Str.length; i += 64) {
-		lines.push(base64Str.slice(i, i + 64));
+	for (let i = 0; i < base64.length; i += 64) {
+		lines.push(base64.slice(i, i + 64));
 	}
 
 	// Construct PEM format with headers and footers

package/src/cli.ts

@@ -72,7 +72,7 @@ function parseArgs(): {
 } {
 	const args = process.argv.slice(2);
 	const options: CliOptions = {
-		network: 'sepolia',
+		network: 'mainnet',
 		json: false,
 		verbose: false,
 		debug: false,
@@ -104,7 +104,7 @@ function parseArgs(): {
 			console.log(CLI_VERSION);
 			process.exit(0);
 		} else if (arg === '--network' || arg === '-n') {
-			options.network = args[++i] || 'sepolia';
+			options.network = args[++i] || 'mainnet';
 		} else if (arg === '--rpc') {
 			options.rpc = args[++i];
 		} else if (arg === '--contract-did') {
@@ -181,11 +181,11 @@ COMMANDS:
   Subdomain Commands:
     subdomain register <parent> <label>
                                Register a new subdomain (requires PRIVATE_KEY_OR_MNEMONIC)
-                               Use MNEMONIC env var for subdomain owner or auto-generates one
+                               Use SUBDOMAIN_OWNER_MNEMONIC env var for subdomain owner or auto-generates one
     
   Transfer Commands:
     transfer <domain>          Transfer domain ownership to a new owner (requires PRIVATE_KEY_OR_MNEMONIC)
-                               Use MNEMONIC env var for new owner or auto-generates one
+                               Use TO_MNEMONIC env var for new owner or auto-generates one
     
   Wallet Management Commands:
     wallet evm add <domain>    Add EVM wallet to domain (requires PRIVATE_KEY_OR_MNEMONIC & EVM_PRIVATE_KEY)
@@ -216,9 +216,15 @@ COMMANDS:
     tag get-tagger <domain> <tag-name>
                                Get tagger address for a tag (read-only)
     
-  Operator Commands:
-    operator get               Get current operator address
-    operator set <address>     Set operator address (requires PRIVATE_KEY_OR_MNEMONIC)
+  Admin Commands:
+    admin get-owner            Get contract owner address
+    admin get-totalsupply      Get total number of registered domains
+    admin get-operator         Get current operator address
+    admin set-operator <address>
+                               Set operator address (requires PRIVATE_KEY_OR_MNEMONIC)
+    admin transfer-ownership <address>
+                               Transfer contract ownership to new address (requires PRIVATE_KEY_OR_MNEMONIC)
+    admin accept-ownership     Accept pending ownership transfer (requires PRIVATE_KEY_OR_MNEMONIC)
     
   Crypto Utility Commands:
     crypto generate            Generate a new mnemonic phrase (--words option)
@@ -243,7 +249,7 @@ COMMANDS:
     help                       Show this help message
 
 OPTIONS:
-  -n, --network <network>         Network to use (sepolia|mainnet) [default: sepolia]
+  -n, --network <network>         Network to use (sepolia|mainnet) [default: mainnet]
   --rpc <url>                     Custom RPC endpoint URL
   --contract-did <address>        Custom DID contract address
   --contract-resolver <address>   Custom RootResolver contract address
@@ -262,8 +268,8 @@ OPTIONS:
 
 EXAMPLES:
   # Query domain info
-  did-cli info example.olares.com --network mainnet
-  did-cli owner example.olares.com
+  did-cli info example.olares.com
+  did-cli owner example.olares.com --network sepolia
   export PRIVATE_KEY_OR_MNEMONIC=0xYOUR_PRIVATE_KEY
   did-cli is-owner example.olares.com
   
@@ -292,7 +298,7 @@ EXAMPLES:
   did-cli subdomain register parent.com child --words 24
   
   # Subdomain management (use existing mnemonic for subdomain owner)
-  export MNEMONIC="your twelve word mnemonic here"
+  export SUBDOMAIN_OWNER_MNEMONIC="your twelve word mnemonic here"
   did-cli subdomain register parent.com child
   
   # Subdomain management (JSON output)
@@ -304,7 +310,7 @@ EXAMPLES:
   did-cli transfer example.com --words 24
   
   # Transfer domain ownership (use existing mnemonic for new owner)
-  export MNEMONIC="your twelve word mnemonic here"
+  export TO_MNEMONIC="your twelve word mnemonic here"
   did-cli transfer example.com
   
   # Crypto utilities
@@ -366,9 +372,13 @@ EXAMPLES:
   # Remove tag
   did-cli tag remove example.com email
   
-  # Operator management
-  did-cli operator get
-  did-cli operator set 0x1234...
+  # Admin management
+  did-cli admin get-owner
+  did-cli admin get-totalsupply
+  did-cli admin get-operator
+  did-cli admin set-operator 0x1234...
+  did-cli admin transfer-ownership 0x5678...
+  did-cli admin accept-ownership
   
   # Utilities
   did-cli convert pem-to-der ./public-key.pem
@@ -378,8 +388,12 @@ EXAMPLES:
 ENVIRONMENT VARIABLES:
   PRIVATE_KEY_OR_MNEMONIC         Private key (0x...) or mnemonic phrase for signing transactions
                                   (required for write operations)
-  MNEMONIC                        Mnemonic phrase for generating owner identity
-                                  (used in subdomain registration, domain transfer, and crypto utilities)
+  SUBDOMAIN_OWNER_MNEMONIC        Mnemonic phrase for generating subdomain owner identity
+                                  (used in subdomain registration)
+  TO_MNEMONIC                     Mnemonic phrase for generating new owner identity
+                                  (used in domain transfer)
+  MNEMONIC                        Mnemonic phrase for crypto utility commands
+                                  (used in crypto address, did, privatekey, derive)
   EVM_PRIVATE_KEY                 EVM wallet private key for wallet management operations
                                   (required for wallet evm add/remove commands)
   SOLANA_PRIVATE_KEY              Solana wallet private key for wallet management operations
@@ -845,9 +859,49 @@ async function removeIP(domain: string, options: CliOptions): Promise<void> {
 }
 
 // ============================================================================
-// Operator Commands
+// Admin Commands
 // ============================================================================
 
+async function getOwnerCli(options: CliOptions): Promise<void> {
+	try {
+		const didConsole = getConsole(options);
+		const owner = await didConsole.getOwner();
+
+		if (options.json) {
+			console.log(JSON.stringify({ owner }, null, 2));
+		} else {
+			console.log(`👤 Contract Owner: ${owner}`);
+		}
+	} catch (error) {
+		console.error(
+			'❌ Error:',
+			error instanceof Error ? error.message : String(error)
+		);
+		process.exit(1);
+	}
+}
+
+async function getTotalSupplyCli(options: CliOptions): Promise<void> {
+	try {
+		const didConsole = getConsole(options);
+		const totalSupply = await didConsole.getTotalSupply();
+
+		if (options.json) {
+			console.log(
+				JSON.stringify({ totalSupply: totalSupply.toString() }, null, 2)
+			);
+		} else {
+			console.log(`📊 Total Domains: ${totalSupply.toString()}`);
+		}
+	} catch (error) {
+		console.error(
+			'❌ Error:',
+			error instanceof Error ? error.message : String(error)
+		);
+		process.exit(1);
+	}
+}
+
 async function getOperator(options: CliOptions): Promise<void> {
 	try {
 		const didConsole = getConsole(options);
@@ -897,6 +951,66 @@ async function setOperator(
 	}
 }
 
+async function transferOwnershipCli(
+	newOwner: string,
+	options: CliOptions
+): Promise<void> {
+	try {
+		const privateKeyOrMnemonic = getPrivateKeyOrMnemonic();
+		const didConsole = getConsole(options);
+		await didConsole.setSigner(privateKeyOrMnemonic);
+
+		const result = await didConsole.transferOwnership(newOwner);
+
+		if (result.success) {
+			console.log(`✅ Ownership transfer initiated to ${newOwner}`);
+			console.log(`📝 Transaction: ${result.transactionHash}`);
+			if (result.gasUsed) {
+				console.log(`⛽ Gas used: ${result.gasUsed.toString()}`);
+			}
+			console.log(
+				'\n⚠️  Note: The new owner must call "admin accept-ownership" to complete the transfer'
+			);
+		} else {
+			console.error(`❌ Failed: ${result.error}`);
+			process.exit(1);
+		}
+	} catch (error) {
+		console.error(
+			'❌ Error:',
+			error instanceof Error ? error.message : String(error)
+		);
+		process.exit(1);
+	}
+}
+
+async function acceptOwnershipCli(options: CliOptions): Promise<void> {
+	try {
+		const privateKeyOrMnemonic = getPrivateKeyOrMnemonic();
+		const didConsole = getConsole(options);
+		await didConsole.setSigner(privateKeyOrMnemonic);
+
+		const result = await didConsole.acceptOwnership();
+
+		if (result.success) {
+			console.log('✅ Ownership transfer accepted successfully');
+			console.log(`📝 Transaction: ${result.transactionHash}`);
+			if (result.gasUsed) {
+				console.log(`⛽ Gas used: ${result.gasUsed.toString()}`);
+			}
+		} else {
+			console.error(`❌ Failed: ${result.error}`);
+			process.exit(1);
+		}
+	} catch (error) {
+		console.error(
+			'❌ Error:',
+			error instanceof Error ? error.message : String(error)
+		);
+		process.exit(1);
+	}
+}
+
 // ============================================================================
 // Conversion Utilities
 // ============================================================================
@@ -1001,11 +1115,13 @@ async function registerSubdomain(
 
 		// Get or generate mnemonic for subdomain owner
 		let mnemonic: string;
-		const subdomainMnemonic = process.env.MNEMONIC;
+		const subdomainMnemonic = process.env.SUBDOMAIN_OWNER_MNEMONIC;
 
 		if (subdomainMnemonic) {
 			mnemonic = subdomainMnemonic;
-			console.log('📝 Using mnemonic from MNEMONIC environment variable');
+			console.log(
+				'📝 Using mnemonic from SUBDOMAIN_OWNER_MNEMONIC environment variable'
+			);
 		} else {
 			const wordCount = options.words || 12;
 			if (![12, 15, 18, 21, 24].includes(wordCount)) {
@@ -1014,7 +1130,7 @@ async function registerSubdomain(
 				);
 				process.exit(1);
 			}
-			mnemonic = await generateMnemonic(wordCount);
+			mnemonic = generateMnemonic(wordCount);
 
 			// Save mnemonic to file
 			const mnemonicFile = './subdomain-mnemonic.txt';
@@ -1036,7 +1152,9 @@ async function registerSubdomain(
 			);
 			console.log(`  • Command: rm ${mnemonicFile}`);
 			console.log('\n💡 To use this mnemonic for future operations:');
-			console.log(`  export MNEMONIC="$(cat ${mnemonicFile})"\n`);
+			console.log(
+				`  export SUBDOMAIN_OWNER_MNEMONIC="$(cat ${mnemonicFile})"\n`
+			);
 		}
 
 		// Register subdomain
@@ -1126,12 +1244,12 @@ async function transferDomain(
 
 		// Get or generate mnemonic for new owner
 		let mnemonic: string;
-		const newOwnerMnemonic = process.env.MNEMONIC;
+		const newOwnerMnemonic = process.env.TO_MNEMONIC;
 
 		if (newOwnerMnemonic) {
 			mnemonic = newOwnerMnemonic;
 			console.log(
-				'📝 Using mnemonic from MNEMONIC environment variable for new owner'
+				'📝 Using mnemonic from TO_MNEMONIC environment variable for new owner'
 			);
 		} else {
 			const wordCount = options.words || 12;
@@ -1141,7 +1259,7 @@ async function transferDomain(
 				);
 				process.exit(1);
 			}
-			mnemonic = await generateMnemonic(wordCount);
+			mnemonic = generateMnemonic(wordCount);
 
 			// Save mnemonic to file
 			const mnemonicFile = './transfer-new-owner-mnemonic.txt';
@@ -1163,7 +1281,7 @@ async function transferDomain(
 			);
 			console.log(`  • Command: rm ${mnemonicFile}`);
 			console.log('\n💡 To use this mnemonic for future operations:');
-			console.log(`  export MNEMONIC="$(cat ${mnemonicFile})"\n`);
+			console.log(`  export TO_MNEMONIC="$(cat ${mnemonicFile})"\n`);
 		}
 
 		// Transfer domain
@@ -1228,7 +1346,7 @@ async function cryptoGenerate(options: CliOptions): Promise<void> {
 			process.exit(1);
 		}
 
-		const mnemonic = await generateMnemonic(wordCount);
+		const mnemonic = generateMnemonic(wordCount);
 
 		// Save mnemonic to file
 		const outputFile = options.output || './mnemonic.txt';
@@ -2339,7 +2457,7 @@ async function main(): Promise<void> {
 						'Note: Set PRIVATE_KEY_OR_MNEMONIC environment variable first'
 					);
 					console.error(
-						'Optional: Set MNEMONIC environment variable for new owner (auto-generates if not set)'
+						'Optional: Set TO_MNEMONIC environment variable for new owner (auto-generates if not set)'
 					);
 					process.exit(1);
 				}
@@ -2474,7 +2592,7 @@ async function main(): Promise<void> {
 								'Note: Set PRIVATE_KEY_OR_MNEMONIC environment variable first'
 							);
 							console.error(
-								'Optional: Set MNEMONIC environment variable for subdomain owner (auto-generates if not set)'
+								'Optional: Set SUBDOMAIN_OWNER_MNEMONIC environment variable for subdomain owner (auto-generates if not set)'
 							);
 							process.exit(1);
 						}
@@ -2488,24 +2606,32 @@ async function main(): Promise<void> {
 				}
 				break;
 
-			// Operator commands
-			case 'operator':
+			// Admin commands
+			case 'admin':
 				if (!subCommand) {
-					console.error('❌ Error: Operator subcommand is required');
-					console.error('Usage: did-cli operator <get|set> [args]');
+					console.error('❌ Error: Admin subcommand is required');
+					console.error(
+						'Usage: did-cli admin <get-owner|get-totalsupply|get-operator|set-operator|transfer-ownership|accept-ownership> [args]'
+					);
 					process.exit(1);
 				}
 				switch (subCommand) {
-					case 'get':
+					case 'get-owner':
+						await getOwnerCli(options);
+						break;
+					case 'get-totalsupply':
+						await getTotalSupplyCli(options);
+						break;
+					case 'get-operator':
 						await getOperator(options);
 						break;
-					case 'set':
+					case 'set-operator':
 						if (!domain) {
 							console.error(
 								'❌ Error: Operator address is required'
 							);
 							console.error(
-								'Usage: did-cli operator set <address>'
+								'Usage: did-cli admin set-operator <address>'
 							);
 							console.error(
 								'Note: Set PRIVATE_KEY_OR_MNEMONIC environment variable first'
@@ -2514,9 +2640,27 @@ async function main(): Promise<void> {
 						}
 						await setOperator(domain, options);
 						break;
+					case 'transfer-ownership':
+						if (!domain) {
+							console.error(
+								'❌ Error: New owner address is required'
+							);
+							console.error(
+								'Usage: did-cli admin transfer-ownership <address>'
+							);
+							console.error(
+								'Note: Set PRIVATE_KEY_OR_MNEMONIC environment variable first'
+							);
+							process.exit(1);
+						}
+						await transferOwnershipCli(domain, options);
+						break;
+					case 'accept-ownership':
+						await acceptOwnershipCli(options);
+						break;
 					default:
 						console.error(
-							`❌ Unknown operator subcommand: ${subCommand}`
+							`❌ Unknown admin subcommand: ${subCommand}`
 						);
 						process.exit(1);
 				}
@@ -2953,7 +3097,6 @@ async function main(): Promise<void> {
 	}
 }
 
-// 运行主函数
 main().catch((error) => {
 	console.error(
 		'❌ Unexpected error:',