create Wallet CLI updates

wallet changes

Author: tomekmarchi

components/cryptoID/index.js

@@ -48,58 +48,55 @@ export class CryptoID {
 		return this;
 	}
 	async initializeKeypairs() {
-		if (isBuffer(this.signatureKeypair)) {
+		if (await this.cipherSuite.signature.isKeypairInitialized(this.signatureKeypair) === false) {
 			this.signatureKeypair = await this.cipherSuite.signature.initializeKeypair(this.signatureKeypair);
 		}
-		if (isBuffer(this.keyExchangeKeypair)) {
+		if (await this.cipherSuite.keyExchange.isKeypairInitialized(this.keyExchangeKeypair) === false) {
 			this.keyExchangeKeypair = await this.cipherSuite.keyExchange.initializeKeypair(this.keyExchangeKeypair);
 		}
 	}
-	async importKeypairs(config) {
+	async importKeypairs(core) {
 		const {
-			version,
 			signatureKeypair,
 			keyExchangeKeypair,
-			cipherSuite
-		} = config;
+		} = core;
 		if (signatureKeypair) {
 			this.signatureKeypair = signatureKeypair;
 		}
 		if (keyExchangeKeypair) {
 			this.keyExchangeKeypair = keyExchangeKeypair;
 		}
-		if (version) {
-			this.version = version;
-		}
-		if (cipherSuite?.id) {
-			this.cipherSuiteId = cipherSuite.id;
-		}
 		await this.initializeKeypairs();
+		return this;
 	}
 	async generate(options) {
 		this.signatureKeypair = await this.cipherSuite.signature.signatureKeypair();
 		this.keyExchangeKeypair = await this.cipherSuite.keyExchange.keyExchangeKeypair();
-		console.log('KEY EXCHANGE', this.keyExchangeKeypair);
+		// console.log('KEY EXCHANGE', this.keyExchangeKeypair);
 	}
 	async importFromBinary(data, encryptionKey) {
 		const password = (isString(encryptionKey)) ? await this.cipherSuite.hash.hash256(Buffer.from(encryptionKey)) : encryptionKey;
-		const decodedData = (password) ? await this.decryptBinary(data, password) : await decode(data);
-		await this.importFromObject(decodedData, password);
+		const encodedData = decode(data);
+		const decodedCore = (password) ? await this.decryptBinary(encodedData.core, password) : encodedData.core;
+		encodedData.core = decodedCore;
+		await this.importFromObject(encodedData, password);
 		return this;
 	}
 	async importFromObject(decodedData, encryptionKey) {
 		const password = (isString(encryptionKey)) ? await this.cipherSuite.hash.hash256(Buffer.from(encryptionKey)) : encryptionKey;
 		const data = (password) ? await this.decryptBinary(decodedData.encrypted, password) : decodedData;
 		const {
 			version,
-			keyExchangeKeypair,
-			signatureKeypair,
-			cipherSuiteId
+			cipherID,
+			core: {
+				keyExchangeKeypair,
+				signatureKeypair,
+			},
 		} = data;
 		this.version = version;
 		this.keyExchangeKeypair = keyExchangeKeypair;
 		this.signatureKeypair = signatureKeypair;
-		this.cipherSuiteId = cipherSuiteId;
+		this.cipherID = cipherID;
 		await this.initializeKeypairs();
 		return this;
 	}
@@ -108,7 +105,7 @@ export class CryptoID {
 		return decode(decrypted);
 	}
 	async exportKeypairs() {
-		console.log('keyExchangeKeypair', this.keyExchangeKeypair);
+		// console.log('keyExchangeKeypair', this.keyExchangeKeypair);
 		const keyExchangeKeypair = await this.cipherSuite.keyExchange.exportKeypair(this.keyExchangeKeypair);
 		const signatureKeypair = await this.cipherSuite.signature.exportKeypair(this.signatureKeypair);
 		return {
@@ -117,16 +114,14 @@ export class CryptoID {
 		};
 	}
 	async exportBinary(encryptionKey) {
-		const {
-			version,
-			cipherSuiteId
-		} = this;
+		const { version, } = this;
 		const data = {
 			version,
-			cipherSuiteId,
 			date: Date.now(),
+			cipherID: this.cipherSuite.id,
+			core: {}
 		};
-		assign(data, await this.exportKeypairs());
+		assign(data.core, await this.exportKeypairs());
 		const dataEncoded = await encodeStrict(data);
 		if (encryptionKey) {
 			const password = (isString(encryptionKey)) ? await this.cipherSuite.hash.hash256(Buffer.from(encryptionKey)) : encryptionKey;
@@ -144,9 +139,8 @@ export class CryptoID {
 	async importFile(filePath, encryptionPassword) {
 		const data = await readStructured(filePath);
 		if (data) {
-			return this.importFromObject(data, encryptionPassword);
+			const loadedFile = await this.importFromObject(data, encryptionPassword);
 		}
-		console.log('Error Importing Profile', filePath);
 		return false;
 	}
 	async saveToKeychain(accountName = 'profile', encryptionPassword) {

utilities/cryptography/keyExchange/kyber768_x25519.js

@@ -110,6 +110,12 @@ async function initializeKeypair(keypair, target) {
 		kyberKeypair
 	};
 }
+async function isKeypairInitialized(source) {
+	if (source.x25519Keypair && source.kyberKeypair) {
+		return true;
+	}
+	return false;
+}
 async function initializeCertificateKeypair(keypair, target) {
 	const result = await initializeKeypair(keypair, target);
 	return result;
@@ -134,6 +140,7 @@ export const kyber768_x25519 = keyExchange({
 	initializeCertificateKeypair,
 	exportKeypair,
 	initializeKeypair,
+	isKeypairInitialized,
 	// partial initial encryption on first packet
 	async clientInitializeSession(source, destination) {
 		source.x25519Keypair.sharedSecret = await x25519.getSharedSecret(source.x25519Keypair, destination.x25519Keypair);

utilities/cryptography/signature/viat.js

@@ -103,6 +103,12 @@ export async function initializeKeypair(sourceArg) {
 	target.sphincs = sphincs;
 	return target;
 }
+async function isKeypairInitialized(source) {
+	if (source.ed25519 && source.dilithium && source.sphincs) {
+		return true;
+	}
+	return false;
+}
 export async function signMethod(message, source) {
 	const signatureArray = [];
 	const {
@@ -219,6 +225,7 @@ export const viat = signatureScheme({
 	privateKeySize,
 	signatureSize,
 	seedSize,
+	isKeypairInitialized,
 	createKeypair,
 	verifyMethod,
 	signMethod,

viat/createWalletCLI.js

@@ -18,7 +18,11 @@ program
 		const result = await createWallet(filename, filepath, key);
 		// console.log(await decode(await result.exportBinary()));
 	});
+program.addHelpText('after', `
+Example Commands:
+  ./createWalletCLI.js walletFileName.bin /FILE/PATH/TO/SAVE/TO
+`);
 program.option('-v, --verbose', 'Enable verbose output');
 // Parse command-line arguments
 program.parse(process.argv);
-// ./createWalletCLI.js walletFileName.bin /FILE/PATH/TO/SAVE/TO
+// CLI COMMAND ./createWalletCLI.js walletFileName.bin /FILE/PATH/TO/SAVE/TO

viat/wallet/wallet.js

@@ -16,4 +16,5 @@ export function wallet(config) {
 	const source = new Wallet(config);
 	return source;
 }
-// console.log('Wallet:', (await wallet()));
+// (await wallet('/Users/thomasmarchi/MEGA/Github/Network/viat/wallet.bin'));
+// console.log('Wallet:', (await wallet('/Users/thomasmarchi/MEGA/Github/Network/viat/wallet.bin')));