@beclab/olaresid 0.1.3 → 0.1.5

package/examples/wallet-management.ts

@@ -56,10 +56,10 @@ async function main() {
 	console.log('');
 
 	// 2. Add a new EVM wallet (optional - only if you have an EVM private key)
-	if (process.env.EVM_WALLET_PRIVATE_KEY) {
+	if (process.env.EVM_PRIVATE_KEY) {
 		console.log('2️⃣ Adding a new EVM wallet...');
 		const addResult = await domain.addEVMWallet(
-			process.env.EVM_WALLET_PRIVATE_KEY
+			process.env.EVM_PRIVATE_KEY
 		);
 
 		if (addResult.success) {
@@ -87,10 +87,10 @@ async function main() {
 	}
 
 	// 4. Remove an EVM wallet (optional)
-	if (process.env.EVM_WALLET_TO_REMOVE) {
+	if (process.env.EVM_PRIVATE_KEY) {
 		console.log('4️⃣ Removing an EVM wallet...');
 		const removeResult = await domain.removeEVMWallet(
-			process.env.EVM_WALLET_TO_REMOVE
+			process.env.EVM_PRIVATE_KEY
 		);
 
 		if (removeResult.success) {
@@ -127,10 +127,10 @@ async function main() {
 	console.log('');
 
 	// 6. Add a new Solana wallet (optional - only if you have a Solana private key)
-	if (process.env.SOLANA_WALLET_PRIVATE_KEY) {
+	if (process.env.SOLANA_PRIVATE_KEY) {
 		console.log('6️⃣ Adding a new Solana wallet...');
 		const addResult = await domain.addSolanaWallet(
-			process.env.SOLANA_WALLET_PRIVATE_KEY
+			process.env.SOLANA_PRIVATE_KEY
 		);
 
 		if (addResult.success) {
@@ -162,10 +162,10 @@ async function main() {
 	}
 
 	// 8. Remove a Solana wallet (optional)
-	if (process.env.SOLANA_WALLET_TO_REMOVE) {
+	if (process.env.SOLANA_PRIVATE_KEY) {
 		console.log('8️⃣ Removing a Solana wallet...');
 		const removeResult = await domain.removeSolanaWallet(
-			process.env.SOLANA_WALLET_TO_REMOVE
+			process.env.SOLANA_PRIVATE_KEY
 		);
 
 		if (removeResult.success) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@beclab/olaresid",
-    "version": "0.1.3",
+    "version": "0.1.5",
     "description": "DID Contract SDK with CLI tool",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -39,9 +39,8 @@
     "dependencies": {
         "@solana/web3.js": "^1.87.6",
         "@trustwallet/wallet-core": "^3.2.9",
-        "bip39": "^3.1.0",
-        "bs58": "^5.0.0",
         "ethers": "^6.9.1",
+        "multiformats": "9.6.4",
         "tweetnacl": "^1.0.3",
         "tweetnacl-util": "^0.15.1",
         "varint": "^6.0.0"

package/src/business/index.ts

@@ -4,6 +4,12 @@ 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
@@ -47,7 +53,12 @@ export {
 	getEVMPrivateKeyFromMnemonic,
 	getDIDFromMnemonic,
 	generateDIDKeyData,
-	deriveDIDFromMnemonic
+	deriveDIDFromMnemonic,
+	getEd25519JwkFromMnemonic,
+	base64ToUint8Array,
+	uint8ArrayToHex,
+	hexToUint8Array,
+	uint8ArrayToBase64
 } from '../utils/crypto-utils';
 export type { RSAPublicKeyData, DIDKeyData } from '../utils/crypto-utils';
 
@@ -179,7 +190,7 @@ export class DomainContext {
 	 * ```typescript
 	 * // For parent domain "parent.com", register subdomain "child"
 	 * const parentDomain = olaresId.domain('parent.com');
-	 * const mnemonic = generateMnemonic(12);
+	 * const mnemonic = await generateMnemonic(12);
 	 *
 	 * const result = await parentDomain.registerSubdomain('child', mnemonic);
 	 * // This will register "child.parent.com"
@@ -265,7 +276,7 @@ export class DomainContext {
 	 *
 	 * @example
 	 * ```typescript
-	 * const mnemonic = generateMnemonic(12);
+	 * const mnemonic = await generateMnemonic(12);
 	 * const result = await domain.transfer(mnemonic);
 	 * if (result.success) {
 	 *   console.log('Domain transferred!');
@@ -845,18 +856,22 @@ export class DomainContext {
 			const { Keypair } = await import('@solana/web3.js');
 			const nacl = await import('tweetnacl');
 			const { decodeUTF8 } = await import('tweetnacl-util');
+			const { base58btc } = await import('multiformats/bases/base58');
 
 			// Parse Solana private key (support both base58 and base64)
 			let solanaWallet: any;
 			try {
 				// Try base58 first (most common format for Phantom)
-				const bs58 = await import('bs58');
-				const secretKey = bs58.default.decode(solanaPrivateKey);
+				// Solana uses plain base58, but multiformats requires 'z' prefix for multibase
+				const base58Key = solanaPrivateKey.startsWith('z')
+					? solanaPrivateKey
+					: 'z' + solanaPrivateKey;
+				const secretKey = base58btc.decode(base58Key);
 				solanaWallet = Keypair.fromSecretKey(secretKey);
 			} catch {
 				// Try base64
 				try {
-					const secretKey = Buffer.from(solanaPrivateKey, 'base64');
+					const secretKey = base64ToUint8Array(solanaPrivateKey);
 					solanaWallet = Keypair.fromSecretKey(secretKey);
 				} catch {
 					// Try as JSON array
@@ -867,9 +882,9 @@ export class DomainContext {
 				}
 			}
 
-			// Get Solana address as bytes32
+			// Get Solana address as bytes32 (cross-platform)
 			const solanaAddressBytes =
-				'0x' + solanaWallet.publicKey.toBuffer().toString('hex');
+				'0x' + uint8ArrayToHex(solanaWallet.publicKey.toBytes());
 
 			// Get current timestamp
 			const signAt = Math.floor(Date.now() / 1000) - 30 * 60; // 30 minutes ago
@@ -929,8 +944,8 @@ export class DomainContext {
 				decodeUTF8(solanaMsg),
 				solanaWallet.secretKey
 			);
-			const sigFromAuthAddrHex =
-				'0x' + Buffer.from(sigFromAuthAddr).toString('hex');
+			// Convert signature to hex (cross-platform)
+			const sigFromAuthAddrHex = '0x' + uint8ArrayToHex(sigFromAuthAddr);
 
 			// Call contract
 			const tx = await rootTagger.updateSolanaWallet(
@@ -978,18 +993,22 @@ export class DomainContext {
 		try {
 			// Import Solana libraries dynamically
 			const { Keypair } = await import('@solana/web3.js');
+			const { base58btc } = await import('multiformats/bases/base58');
 
 			// Parse Solana private key
 			let solanaWallet: any;
 			try {
 				// Try base58 first
-				const bs58 = await import('bs58');
-				const secretKey = bs58.default.decode(solanaPrivateKey);
+				// Solana uses plain base58, but multiformats requires 'z' prefix for multibase
+				const base58Key = solanaPrivateKey.startsWith('z')
+					? solanaPrivateKey
+					: 'z' + solanaPrivateKey;
+				const secretKey = base58btc.decode(base58Key);
 				solanaWallet = Keypair.fromSecretKey(secretKey);
 			} catch {
 				// Try base64
 				try {
-					const secretKey = Buffer.from(solanaPrivateKey, 'base64');
+					const secretKey = base64ToUint8Array(solanaPrivateKey);
 					solanaWallet = Keypair.fromSecretKey(secretKey);
 				} catch {
 					// Try as JSON array
@@ -1000,9 +1019,9 @@ export class DomainContext {
 				}
 			}
 
-			// Get Solana address as bytes32
+			// Get Solana address as bytes32 (cross-platform)
 			const solanaAddressBytes =
-				'0x' + solanaWallet.publicKey.toBuffer().toString('hex');
+				'0x' + uint8ArrayToHex(solanaWallet.publicKey.toBytes());
 
 			// Get current timestamp
 			const signAt = Math.floor(Date.now() / 1000) - 30 * 60; // 30 minutes ago
@@ -1103,11 +1122,8 @@ 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) => {
-				// 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 hex to Uint8Array (cross-platform)
+				const buffer = hexToUint8Array(item.addr);
 				// Convert to Solana public key and then to base58
 				return new PublicKey(buffer).toBase58();
 			});
@@ -1422,26 +1438,16 @@ export function bytes4ToIpv4(bytes4Hex: string): string {
  */
 export function pemToDer(pem: string): string {
 	// Remove PEM headers, footers, and whitespace
-	const base64 = pem
+	const base64Str = pem
 		.replace(/-----BEGIN.*?-----/g, '')
 		.replace(/-----END.*?-----/g, '')
 		.replace(/\s/g, '');
 
-	// Convert base64 to hex
-	let hexString: string;
-
-	// Check if running in Node.js or browser
-	if (typeof Buffer !== 'undefined') {
-		// Node.js environment
-		const derBuffer = Buffer.from(base64, 'base64');
-		hexString = derBuffer.toString('hex');
-	} else {
-		// Browser environment
-		const binaryString = atob(base64);
-		hexString = Array.from(binaryString, (char) =>
-			char.charCodeAt(0).toString(16).padStart(2, '0')
-		).join('');
-	}
+	// Convert base64 to Uint8Array using cross-platform method
+	const derBuffer = base64ToUint8Array(base64Str);
+
+	// Convert to hex string
+	const hexString = uint8ArrayToHex(derBuffer);
 
 	// Convert to hex string with 0x prefix
 	return '0x' + hexString;
@@ -1456,31 +1462,14 @@ export function derToPem(derHex: string): string {
 	// Remove '0x' prefix if present
 	const hexString = derHex.startsWith('0x') ? derHex.slice(2) : derHex;
 
-	// Convert hex to base64
-	let base64: string;
-
-	// Check if running in Node.js or browser
-	if (typeof Buffer !== 'undefined') {
-		// Node.js environment
-		const derBuffer = Buffer.from(hexString, 'hex');
-		base64 = derBuffer.toString('base64');
-	} else {
-		// Browser environment
-		// Convert hex string to byte array
-		const bytes = new Uint8Array(hexString.length / 2);
-		for (let i = 0; i < hexString.length; i += 2) {
-			bytes[i / 2] = parseInt(hexString.substr(i, 2), 16);
-		}
-		// Convert byte array to binary string
-		const binaryString = String.fromCharCode(...bytes);
-		// Convert to base64
-		base64 = btoa(binaryString);
-	}
+	// Convert hex to base64 using cross-platform methods
+	const bytes = hexToUint8Array(hexString);
+	const base64Str = uint8ArrayToBase64(bytes);
 
 	// Split base64 into 64-character lines for PEM format
 	const lines: string[] = [];
-	for (let i = 0; i < base64.length; i += 64) {
-		lines.push(base64.slice(i, i + 64));
+	for (let i = 0; i < base64Str.length; i += 64) {
+		lines.push(base64Str.slice(i, i + 64));
 	}
 
 	// Construct PEM format with headers and footers

package/src/cli.ts

@@ -1014,7 +1014,7 @@ async function registerSubdomain(
 				);
 				process.exit(1);
 			}
-			mnemonic = generateMnemonic(wordCount);
+			mnemonic = await generateMnemonic(wordCount);
 
 			// Save mnemonic to file
 			const mnemonicFile = './subdomain-mnemonic.txt';
@@ -1141,7 +1141,7 @@ async function transferDomain(
 				);
 				process.exit(1);
 			}
-			mnemonic = generateMnemonic(wordCount);
+			mnemonic = await generateMnemonic(wordCount);
 
 			// Save mnemonic to file
 			const mnemonicFile = './transfer-new-owner-mnemonic.txt';
@@ -1228,7 +1228,7 @@ async function cryptoGenerate(options: CliOptions): Promise<void> {
 			process.exit(1);
 		}
 
-		const mnemonic = generateMnemonic(wordCount);
+		const mnemonic = await generateMnemonic(wordCount);
 
 		// Save mnemonic to file
 		const outputFile = options.output || './mnemonic.txt';

package/src/index.ts

@@ -8,28 +8,7 @@ import { debug } from './debug';
 import { parseContractError } from './utils/error-parser';
 import { normalizeToDomain } from './utils/olares-id';
 
-import {
-	DomainContext,
-	DomainMetaInfo,
-	DomainInfo,
-	TagInfo,
-	TransactionResult,
-	RSAPublicKeyData,
-	DIDKeyData,
-	UserType,
-	createRsaKeyPair,
-	pemToDer,
-	derToPem,
-	ipv4ToBytes4,
-	bytes4ToIpv4,
-	generateMnemonic,
-	getEthereumAddressFromMnemonic,
-	getEVMPrivateKeyFromMnemonic,
-	getDIDFromMnemonic,
-	generateDIDKeyData,
-	deriveDIDFromMnemonic
-} from './business';
-import { TagContext } from './business/tag-context';
+import { DomainContext, TransactionResult } from './business';
 
 // Import Tag utilities
 import { TagTypeBuilder } from './utils/tag-type-builder';
@@ -58,7 +37,13 @@ export {
 	getEVMPrivateKeyFromMnemonic,
 	getDIDFromMnemonic,
 	generateDIDKeyData,
-	deriveDIDFromMnemonic
+	deriveDIDFromMnemonic,
+	getEd25519JwkFromMnemonic,
+	// Cross-platform encoding utilities
+	base64ToUint8Array,
+	uint8ArrayToHex,
+	hexToUint8Array,
+	uint8ArrayToBase64
 } from './business';
 
 type Domain = PackageDomain.Domain;