hodl-wallet 1.0.6 → 1.1.8

package/README.md

@@ -2,9 +2,16 @@
 
 ![HODL Wallet](https://raw.githubusercontent.com/clasen/HODL/refs/heads/master/example.jpg)
 
+## 🚀 Install and try!
+
+```bash
+npm install -g hodl-wallet
+hodl
+```
+
 ## 🚀 Why HODL Wallet?
 
-Let's face it, Trust Wallet's sluggishness and annoying ads are so last season. HODL Wallet is here to revolutionize your crypto experience:
+Let's face it, Trust Wallet's sluggishness and annoying ads are so last season. HODL Wallet is here to agilize your crypto experience.
 
 - 🏎️ Lightning-fast operations
 - 🧊 Cool, minimalist CLI interface
@@ -12,18 +19,6 @@ Let's face it, Trust Wallet's sluggishness and annoying ads are so last season.
 - 🔒 Create wallets offline (because paranoia is just good sense in crypto)
 - 🔍 Fully transparent, open-source code
 
-## 🛠️ Installation
-
-```bash
-npm install -g hodl-wallet
-```
-
-## 🚀 Quick Start
-
-```bash
-hodl
-```
-
 That's it! Follow the prompts and you're in crypto heaven.
 
 ## 🎮 Features
@@ -40,17 +35,21 @@ Smoother than sliding into your crush's DMs.
 
 Because constantly checking your balance is totally healthy.
 
+### 📘 Address Book
+
+Keep your favorite addresses handy. No more copy-pasting!
+
 ## 🔒 Security
 
-### Private Key Storage
+### 🔑 Private Key Storage
 
-Your private key is securely stored in a JSON file, encrypted with your first password. This ensures that your sensitive information remains protected while still being accessible when you need it.
+Your private key is securely stored in a JSON file, encrypted with a password of your choice. The encryption adds an extra layer of security, making it significantly harder for unauthorized parties to access your private key even if they gain access to the JSON file.
 
-## 🔬 Transparency
+### 🔬 Transparency
 
 We're as transparent as your ex's excuses. Our code is open-source, and we encourage you to dive in, explore, and contribute. Trust isn't given; it's earned and verified.
 
-## 🔍 Security Audit
+### 🔍 Security Audit
 
 We encourage users to perform their own security audits. One easy way to do this is to copy the entire codebase into ChatGPT or another AI assistant and ask if the code appears secure or if there are any malicious intentions. This is a good practice for any open-source project you're considering using.
 

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);
         }
     }
@@ -85,56 +86,88 @@ class Wallet {
     async loadAccount(forceReload = false) {
         let account = this.db.secureGet('account');
 
+        const choices = ['Create New Account', 'Import Mnemonic (12 words)', 'Import private-key'];
+
+        if (forceReload) {
+            choices.push('Export Account');
+            choices.push('Go back');
+        }
+
         if (!account || forceReload) {
             const { accountAction } = await inquirer.prompt({
                 type: 'list',
                 name: 'accountAction',
                 message: 'Select an account option:',
-                choices: ['Import private key', 'Import from 12 words', 'Create new account'],
+                choices,
             });
 
-            if (accountAction === 'Import private key') {
-                const { privateKey } = await inquirer.prompt({
-                    type: 'password',
-                    name: 'privateKey',
-                    message: 'Private key:',
-                    mask: '*',
+            if (accountAction === 'Go back') {
+                return;
+            }
+
+            if (account && accountAction !== 'Export Account') {
+                const { confirmOverwrite } = await inquirer.prompt({
+                    type: 'confirm',
+                    name: 'confirmOverwrite',
+                    message: 'This action will overwrite the existing account. Are you sure you want to continue?',
+                    default: false,
                 });
-                account = this.web3.eth.accounts.privateKeyToAccount(privateKey);
-                await this.db.secureSet('account', { privateKey: account.privateKey });
 
-                this.account = account;
-                this.displayAccountAddress();
-            } else if (accountAction === 'Import from 12 words') {
-                account = await this.importFrom12Words();
-                this.account = account;
-                this.displayAccountAddress();
-            } else {
+                if (!confirmOverwrite) {
+                    return;
+                }
+            }
+
+            if (accountAction === 'Create New Account') {
                 const mnemonic = bip39.generateMnemonic();
                 const seed = await bip39.mnemonicToSeed(mnemonic);
                 const root = hdkey.fromMasterSeed(seed);
                 const addrNode = root.derive("m/44'/60'/0'/0/0");
                 const privateKey = addrNode.privateKey.toString('hex');
-                account = this.web3.eth.accounts.privateKeyToAccount('0x' + privateKey);
-                this.db.secureSet('account', { privateKey: account.privateKey });
+                this.account = this.web3.eth.accounts.privateKeyToAccount('0x' + privateKey);
+                this.account.mnemonic = mnemonic;
+                await this.db.secureSet('account', this.account);
+                this.displayAccountDetails();
+            }
 
-                const table = new Table({
-                    head: [{ colSpan: 2, content: 'New Account Created' }],
-                    style: { head: ['green'] },
-                    wordWrap: true
+            if (accountAction === 'Import private-key') {
+                const { privateKey } = await inquirer.prompt({
+                    type: 'password',
+                    name: 'privateKey',
+                    message: 'Private-key:',
+                    mask: '*',
                 });
 
-                table.push(
-                    ['Address', account.address],
-                    ['Private Key', account.privateKey],
-                    ['Mnemonic Phrase', mnemonic],
-                    ['WARNING', "Please write down your mnemonic phrase and keep it in a safe place. \nIt\'s crucial for recovering your account."]
-                );
+                if (!privateKey.trim()) {
+                    Wallet.displayError('Private-key is empty.');
+                    return;
+                }
+
+                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;
+                }
+            }
 
-                console.log('\n' + table.toString());
+            if (accountAction === 'Import Mnemonic (12 words)') {
+                account = await this.importFrom12Words();
+                if (!account) {
+                    Wallet.displayError('Invalid mnemonic.');
+                    return;
+                }
+                this.account = account;
+                this.displayAccountAddress();
             }
-        } else {
-            account = this.web3.eth.accounts.privateKeyToAccount(account.privateKey);
+
+            if (accountAction === 'Export Account') {
+                await this.displayAccountDetails();
+                return;
+            }
+            return;
         }
 
         this.account = account;
@@ -149,7 +182,6 @@ class Wallet {
         });
 
         if (!bip39.validateMnemonic(mnemonic)) {
-            console.error('Invalid mnemonic phrase');
             return null;
         }
 
@@ -159,14 +191,14 @@ class Wallet {
         const privateKey = addrNode.privateKey.toString('hex');
         const account = this.web3.eth.accounts.privateKeyToAccount('0x' + privateKey);
 
-        await this.db.secureSet('account', { privateKey: account.privateKey });
-
+        account.mnemonic = mnemonic;
+        await this.db.secureSet('account', account);
         return account;
     }
 
     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;
         }
 
@@ -179,9 +211,8 @@ class Wallet {
             colWidths: [21, 22]
         });
 
-        // Add address as the top row
         // table.push([{ colSpan: 2, content: this.account.address }]);
-        table.push([this.selectedNetwork.nativeToken, parseFloat(balance).toFixed(8)]);
+        table.push([this.selectedNetwork.nativeToken, parseFloat(balance).toFixed(3)]);
 
         // Check if USDT is available on the selected network
         if (this.selectedNetwork.tokens['USDT']) {
@@ -212,7 +243,7 @@ class Wallet {
                 (BigInt(usdtBalance) * 100n) / (10n ** BigInt(decimals))
             ) / 100;
 
-            table.push(['USDT', formattedUsdtBalance.toFixed(8)]);
+            table.push(['USDT', formattedUsdtBalance.toFixed(3)]);
         }
 
         console.log(table.toString());
@@ -258,7 +289,6 @@ class Wallet {
         });
 
         if (amount === '') {
-            console.log('Transaction cancelled.');
             return;
         }
 
@@ -271,7 +301,7 @@ class Wallet {
             }
 
             const receipt = await this.web3.eth.sendSignedTransaction(signedTx.rawTransaction);
-            await this.displayTransactionResult(receipt);
+            this.displayTransactionResult(address, token, amount, receipt);
 
             // Add transaction to history
             this.addToTransactions(address, token, amount, receipt);
@@ -281,10 +311,40 @@ class Wallet {
             }
 
         } catch (error) {
-            await this.displayTransactionResult(null, error);
+            this.displayTransactionError(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: [message],
+            style: { head: ['red'] },
+            wordWrap: true,
+        });
+
+        if (data) {
+            table.push([data]);
+        }
+
+        console.log(table.toString());
+    }
+
+    formatDate(date) {
+        return new Date(date).toLocaleString('en-GB', {
+            year: 'numeric',
+            month: '2-digit',
+            day: '2-digit',
+            hour: '2-digit',
+            minute: '2-digit',
+            hour12: false
+        }).replace(/(\d{2})\/(\d{2})\/(\d{4})/, '$3-$2-$1').replace(",", "");
+    }
+
     addToTransactions(recipient, token, amount, receipt) {
         const transaction = {
             timestamp: new Date().toISOString(),
@@ -309,15 +369,8 @@ class Wallet {
         }
 
         history.forEach(tx => {
-            const date = new Date(tx.timestamp).toLocaleString('en-GB', {
-                year: 'numeric',
-                month: '2-digit',
-                day: '2-digit',
-                hour: '2-digit',
-                minute: '2-digit',
-                hour12: false
-            }).replace(/(\d{2})\/(\d{2})\/(\d{4})/, '$3-$2-$1').replace(",", "");
-            table.push([date, tx.recipient, tx.token, tx.amount]);
+            const date = this.formatDate(tx.timestamp);
+            table.push([date, tx.recipient, tx.token, parseFloat(tx.amount).toFixed(3)]);
             table.push([{ colSpan: 4, content: this.selectedNetwork.explorer + tx.hash }]);
         });
 
@@ -389,14 +442,7 @@ class Wallet {
 
             return this.web3.eth.accounts.signTransaction(tx, this.account.privateKey);
         } catch (error) {
-            if (error instanceof Web3ValidatorError) {
-                const table = new Table({
-                    head: [{ colSpan: 2, content: 'Error: Invalid Address' }],
-                    style: { head: ['red'] }
-                });
-                table.push(['Address', recipient]);
-                console.log(table.toString());
-            }
+            this.displayTransactionError(error);
         }
     }
 
@@ -416,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 = {
@@ -436,43 +481,56 @@ class Wallet {
         return this.web3.eth.accounts.signTransaction(tx, this.account.privateKey);
     }
 
-    async displayTransactionResult(receipt, error = null) {
-        if (receipt) {
-            const gasUsed = receipt.gasUsed;
-            const gasPrice = await this.web3.eth.getGasPrice();
-            const transactionFee = this.web3.utils.fromWei((BigInt(gasUsed) * BigInt(gasPrice)).toString(), 'ether');
+    displayTransactionResult(address, token, amount, hash) {
 
-            const table = new Table({
-                head: [{ colSpan: 2, content: 'Transaction successful, share this link with the recipient' }],
-                style: { head: ['green'] }
-            });
-            table.push(
-                ['Explorer', this.selectedNetwork.explorer + receipt.transactionHash],
-                ['Fee', `${transactionFee} ${this.selectedNetwork.nativeToken}`],
-            );
+        const table = new Table({
+            head: ['Date', 'Recipient', 'Token', 'Amount'],
+            style: { head: ['green'] },
+        });
 
-            console.log('\n' + table.toString());
-        } else if (error) {
-            const table = new Table({
-                head: [error.message],
-                style: { head: ['red'] },
-                wordWrap: true,
-            });
+        const date = this.formatDate(new Date());
 
-            if (error.reason) {
-                table.push([error.reason.replace(/(\w+):/g, "\n$1:").trim()]);
-            }
+        table.push([
+            date,
+            address,
+            token,
+            amount.toFixed(3)
+        ]);
+        table.push([{ colSpan: 4, content: this.selectedNetwork.explorer + hash }]);
 
-            console.log('\n' + table.toString());
-        }
+        console.log('\n' + table.toString());
     }
 
     clearAccountData() {
         if (this.account) {
             this.account.privateKey = '0'.repeat(64);
+            this.account.mnemonic = 'x'.repeat(256);
             this.account = null;
         }
     }
+
+    displayAccountDetails() {
+
+        const table = new Table({
+            head: [{ colSpan: 2, content: 'Account Details' }],
+            style: { head: ['green'] },
+            wordWrap: true
+        });
+
+        table.push(
+            ['Address', this.account.address],
+            ['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."]);
+        } else {
+            table.push(['WARNING', "Please keep your private-key secure. Never share it."]);
+        }
+
+        console.log('\n' + table.toString());
+    }
 }
 
 class UIManager {
@@ -546,66 +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) {
+    Wallet.displayError('Wrong password.');
+    process.exit(1);
+}
 
-    // Check if an account exists
-    const accountExists = wallet.db.secureGet('account');
-    if (accountExists === null) {
-        console.error('Wrong password.');
+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: ['Transfer funds', 'Show balance', 'Show transactions', 'Change account', 'Exit'],
-        });
-
-        if (action === 'Transfer funds') {
-            await wallet.transferFunds();
-        } else if (action === 'Show balance') {
+    switch (action) {
+        case 'balance':
             await wallet.showBalance();
-        } else if (action === 'Show transactions') {
+            break;
+        case 'transfer':
+            await wallet.transferFunds();
+            break;
+        case 'history':
             await wallet.showTransactions();
-        } else if (action === 'Change account') {
+            break;
+        case 'account':
             await wallet.loadAccount(true);
-        } else {
+            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.0.6",
+    "version": "1.1.8",
     "description": "🧊 HODL Wallet - Blazing-fast, transparent, and ad-free crypto wallet!",
     "main": "index.mjs",
     "bin": {
@@ -17,13 +17,16 @@
         "ethereum",
         "bsc20",
         "bep20",
-        "evm",
         "bnb",
         "eth",
         "binance",
         "trust",
         "blockchain",
         "bitcoin",
+        "usdt",
+        "stable",
+        "coin",
+        "evm",
         "clasen"
     ],
     "author": "Hodl Wallet",