hodl-wallet 1.1.6 → 1.2.2

package/index.mjs

@@ -29,7 +29,7 @@ class Wallet {
         try {
             const networkPlugins = await this.loadNetworkPlugins();
             if (networkPlugins.length === 0) {
-                console.log('No valid network plugins found.');
+                Wallet.displayError('No valid network plugins found.');
                 process.exit(1);
             }
             await this.selectNetwork(networkPlugins);
@@ -37,11 +37,12 @@ class Wallet {
             await this.loadAccount();
 
             if (!this.account) {
-                throw new Error('Failed to initialize account');
+                Wallet.displayError('Failed to initialize account.');
+                process.exit(1);
             }
 
         } catch (error) {
-            console.error('Initialization failed:', error);
+            Wallet.displayError('Initialization failed', error);
             process.exit(1);
         }
     }
@@ -133,20 +134,31 @@ class Wallet {
                 const { privateKey } = await inquirer.prompt({
                     type: 'password',
                     name: 'privateKey',
-                    message: 'Private key:',
+                    message: 'Private-key:',
                     mask: '*',
                 });
 
-                if (!privateKey) return;
+                if (!privateKey.trim()) {
+                    Wallet.displayError('Private-key is empty.');
+                    return;
+                }
 
-                this.account = this.web3.eth.accounts.privateKeyToAccount(privateKey);
-                await this.db.secureSet('account', this.account);
-                this.displayAccountAddress();
+                try {
+                    this.account = this.web3.eth.accounts.privateKeyToAccount(privateKey);
+                    await this.db.secureSet('account', this.account);
+                    this.displayAccountAddress();
+                } catch (error) {
+                    Wallet.displayError('Invalid private-key.');
+                    return;
+                }
             }
 
             if (accountAction === 'Import Mnemonic (12 words)') {
                 account = await this.importFrom12Words();
-                if (!account) return;
+                if (!account) {
+                    Wallet.displayError('Invalid mnemonic.');
+                    return;
+                }
                 this.account = account;
                 this.displayAccountAddress();
             }
@@ -186,7 +198,7 @@ class Wallet {
 
     async showBalance() {
         if (!this.account) {
-            console.error('Account not initialized. Please try restarting the application.');
+            Wallet.displayError('Account not initialized.', 'Ï Please try restarting the application.');
             return;
         }
 
@@ -299,19 +311,24 @@ class Wallet {
             }
 
         } catch (error) {
-            this.displayError(error);
+            this.displayTransactionError(error);
         }
     }
 
-    displayError(error) {
+    displayTransactionError(error) {
+        const data = error.reason ? error.reason.replace(/(\w+):/g, "\n$1:").trim() : null;
+        Wallet.displayError(error.message, data);
+    }
+
+    static displayError(message, data) {
         const table = new Table({
-            head: [error.message],
+            head: [message],
             style: { head: ['red'] },
             wordWrap: true,
         });
 
-        if (error.reason) {
-            table.push([error.reason.replace(/(\w+):/g, "\n$1:").trim()]);
+        if (data) {
+            table.push([data]);
         }
 
         console.log(table.toString());
@@ -336,11 +353,11 @@ class Wallet {
             amount,
             hash: receipt.transactionHash
         };
-        this.db.add('transactions', this.selectedNetwork.nativeToken, transaction);
+        this.db.add('transactions', this.account.address, this.selectedNetwork.nativeToken, transaction);
     }
 
     async showTransactions() {
-        const history = this.db.values('transactions', this.selectedNetwork.nativeToken) || [];
+        const history = this.db.values('transactions', this.account.address, this.selectedNetwork.nativeToken) || [];
 
         const table = new Table({
             head: ['Date', 'Recipient', 'Token', 'Amount'],
@@ -425,7 +442,7 @@ class Wallet {
 
             return this.web3.eth.accounts.signTransaction(tx, this.account.privateKey);
         } catch (error) {
-            this.displayError(error);
+            this.displayTransactionError(error);
         }
     }
 
@@ -445,13 +462,12 @@ class Wallet {
         if (balance < amountWei + gasCost) {
             const maxAmount = this.web3.utils.fromWei((balance - gasCost).toString(), 'ether');
             const table = new Table({
-                head: [{ colSpan: 2, content: 'Insufficient balance for this transaction' }],
+                head: [{ colSpan: 2, content: 'Insufficient balance for this transaction.' }],
                 style: { head: ['red'] },
                 wordWrap: true
             });
             table.push(['Maximum Amount', `${maxAmount} ${this.selectedNetwork.nativeToken}`]);
             console.log(table.toString());
-            return;
         }
 
         const tx = {
@@ -503,14 +519,14 @@ class Wallet {
 
         table.push(
             ['Address', this.account.address],
-            ['Private Key', this.account.privateKey]
+            ['Private-key', this.account.privateKey]
         );
 
         if (this.account.mnemonic) {
             table.push(['Mnemonic Phrase', this.account.mnemonic]);
-            table.push(['WARNING', "Please keep your private key and mnemonic phrase secure. Never share it."]);
+            table.push(['WARNING', "Please keep your private-key and mnemonic phrase secure. Never share it."]);
         } else {
-            table.push(['WARNING', "Please keep your private key secure. Never share it."]);
+            table.push(['WARNING', "Please keep your private-key secure. Never share it."]);
         }
 
         console.log('\n' + table.toString());
@@ -588,77 +604,72 @@ class UIManager {
     }
 }
 
-async function main() {
-    UIManager.displayWelcome();
-    const encryptionKey = await UIManager.getEncryptionKey();
-    const wallet = new Wallet(encryptionKey);
+UIManager.displayWelcome();
+const encryptionKey = await UIManager.getEncryptionKey();
+const wallet = new Wallet(encryptionKey);
 
-    // Check if an account exists
-    const accountExists = wallet.db.secureGet('account');
-    if (accountExists === null) {
-        console.error('Wrong password.');
+// Check if an account exists
+const accountExists = wallet.db.secureGet('account');
+if (accountExists === null) {
+    Wallet.displayError('Wrong password.');
+    process.exit(1);
+}
+
+if (!accountExists) {
+    const confirmedKey = await UIManager.confirmEncryptionKey(encryptionKey);
+    if (confirmedKey !== encryptionKey) {
+        Wallet.displayError('Passwords do not match. Please try again.');
         process.exit(1);
     }
+}
 
-    if (!accountExists) {
-        const confirmedKey = await UIManager.confirmEncryptionKey(encryptionKey);
-        if (confirmedKey !== encryptionKey) {
-            console.error('Passwords do not match. Please try again.');
-            process.exit(1);
-        }
-    }
+try {
+    await wallet.initialize();
+    if (accountExists) wallet.displayAccountAddress();
+} catch (error) {
+    Wallet.displayError('Failed to initialize wallet.', error);
+    process.exit(1);
+}
 
-    try {
-        await wallet.initialize();
-        if (accountExists) wallet.displayAccountAddress();
-    } catch (error) {
-        console.error('Failed to initialize wallet:', error);
-        process.exit(1);
-    }
+// Register the displayExitPhrase method and account clearing to be called on process exit
+process.on('exit', () => {
+    wallet.clearAccountData();
+    UIManager.displayExitPhrase();
+});
 
-    // Register the displayExitPhrase method and account clearing to be called on process exit
-    process.on('exit', () => {
-        wallet.clearAccountData();
-        UIManager.displayExitPhrase();
+while (true) {
+    const { action } = await inquirer.prompt({
+        type: 'list',
+        name: 'action',
+        message: 'What would you like to do?',
+        choices: [
+            { name: 'Transfer Funds', value: 'transfer' },
+            { name: 'Show Balance', value: 'balance' },
+            { name: 'Show Sents', value: 'history' },
+            { name: 'Account', value: 'account' },
+            { name: 'Exit', value: 'exit' }
+        ],
     });
 
-    while (true) {
-        const { action } = await inquirer.prompt({
-            type: 'list',
-            name: 'action',
-            message: 'What would you like to do?',
-            choices: [
-                { name: 'Transfer Funds', value: 'transfer' },
-                { name: 'Show Balance', value: 'balance' },
-                { name: 'Show Sents', value: 'history' },
-                { name: 'Account', value: 'account' },
-                { name: 'Exit', value: 'exit' }
-            ],
-        });
-
-        switch (action) {
-            case 'balance':
-                await wallet.showBalance();
-                break;
-            case 'transfer':
-                await wallet.transferFunds();
-                break;
-            case 'history':
-                await wallet.showTransactions();
-                break;
-            case 'account':
-                await wallet.loadAccount(true);
-                break;
-            case 'exit':
-                process.exit();
-        }
+    switch (action) {
+        case 'balance':
+            await wallet.showBalance();
+            break;
+        case 'transfer':
+            await wallet.transferFunds();
+            break;
+        case 'history':
+            await wallet.showTransactions();
+            break;
+        case 'account':
+            await wallet.loadAccount(true);
+            break;
+        case 'exit':
+            process.exit();
     }
 }
 
-main().catch(error => {
-    console.error('An unexpected error occurred:', error);
-    process.exit(1);
-});
+
 
 process.on('SIGINT', () => {
     console.log('\n');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hodl-wallet",
-    "version": "1.1.6",
+    "version": "1.2.2",
     "description": "🧊 HODL Wallet - Blazing-fast, transparent, and ad-free crypto wallet!",
     "main": "index.mjs",
     "bin": {