hodl-wallet 1.8.0 → 1.8.4

package/index.js

@@ -464,17 +464,23 @@ class Wallet {
 
             const transactionHash = receipt?.transactionHash || receipt?.hash || 'UNKNOWN_HASH';
 
-            // Get current balance after transfer
+            // Calculate the post-transaction balance
             let currentBalance = 0;
             try {
                 const walletAddress = await this.getAddress();
+                
+                // Get the balance AFTER transaction (not before)
                 if (token === this.selectedNetwork.nativeToken) {
                     currentBalance = await this.network.getBalance(walletAddress);
                 } else {
                     currentBalance = await this.network.getTokenBalance(walletAddress, token);
                 }
+                
+                // Round to avoid floating point precision issues
+                currentBalance = Math.round(currentBalance * 100000000) / 100000000;
+                
             } catch (error) {
-                console.error('Error getting current balance:', error.message);
+                console.error('Error getting post-transaction balance:', error.message);
             }
 
             await this.displayTransactionResult(address, token, numericAmount, transactionHash, currentBalance);

package/network/lib/BaseNetwork.js

@@ -47,7 +47,26 @@ export default class BaseNetwork {
         throw new Error("Method 'validateMnemonic' must be implemented.");
     }
 
-    // Add after line 51
+    async getTokenBalance(address, tokenSymbol) {
+        throw new Error("Method 'getTokenBalance' must be implemented.");
+    }
+
+    async getTokenBalances(address) {
+        const balances = [];
+        
+        // Get native token balance
+        const nativeBalance = await this.getBalance(address);
+        balances.push([this.config.nativeToken, parseFloat(nativeBalance)]);
+
+        // Get balances for all configured tokens
+        for (const symbol of Object.keys(this.config.tokens)) {
+            const tokenBalance = await this.getTokenBalance(address, symbol);
+            balances.push([symbol, tokenBalance]);
+        }
+
+        return balances;
+    }
+
     async sendSignedTransaction(signedTx) {
         throw new Error("Method 'sendSignedTransaction' must be implemented.");
     }

package/network/lib/BitcoinNetwork.js

@@ -30,20 +30,17 @@ export default class BitcoinNetwork extends BaseNetwork {
         }
     }
 
-
-    async getTokenBalances(address) {
-        const balances = [];
-
-        const nativeBalance = await this.getBalance(address);
-        balances.push([this.config.nativeToken, nativeBalance]);
-
-        return balances;
+    async getTokenBalance(address, tokenSymbol) {
+        if (tokenSymbol === this.config.nativeToken) {
+            return await this.getBalance(address);
+        }
+        throw new Error(`Token ${tokenSymbol} not supported on Bitcoin network`);
     }
 
     async transfer(from, to, amount, options = {}) {
         try {
             const utxos = await this.getUTXOs(from.address);
-            const satoshis = BigInt(this.BTCToSatoshis(amount));
+            const satoshis = this.BTCToSatoshis(amount); // Regular number, not BigInt
             const feeRate = options.feeRate || 10; // sats/byte
 
             // Create PSBT instance with network
@@ -51,7 +48,7 @@ export default class BitcoinNetwork extends BaseNetwork {
             psbt.setVersion(2);
             psbt.setLocktime(0);
 
-            let totalInputValue = 0n;
+            let totalInputValue = 0;
 
             // Add inputs
             for (const utxo of utxos) {
@@ -65,16 +62,16 @@ export default class BitcoinNetwork extends BaseNetwork {
                     sequence: 0xffffffff
                 });
 
-                totalInputValue += BigInt(utxo.value);
+                totalInputValue += utxo.value;
 
                 // Break if we have enough funds (considering estimated fee)
-                const estimatedFee = BigInt(this.estimateTxSize(psbt.inputCount, 2) * feeRate);
+                const estimatedFee = this.estimateTxSize(psbt.inputCount, 2) * feeRate;
                 if (totalInputValue >= satoshis + estimatedFee) {
                     break;
                 }
             }
 
-            if (totalInputValue < satoshis + BigInt(feeRate)) {
+            if (totalInputValue < satoshis + feeRate) {
                 throw new Error('Insufficient balance for the transaction including fees.');
             }
 
@@ -85,9 +82,9 @@ export default class BitcoinNetwork extends BaseNetwork {
             });
 
             // Add change output if needed
-            const estimatedFee = BigInt(this.estimateTxSize(psbt.inputCount, 2) * feeRate);
+            const estimatedFee = this.estimateTxSize(psbt.inputCount, 2) * feeRate;
             const changeValue = totalInputValue - satoshis - estimatedFee;
-            if (changeValue > 546n) { // Dust threshold
+            if (changeValue > 546) { // Dust threshold
                 psbt.addOutput({
                     address: from.address,
                     value: changeValue
@@ -167,15 +164,23 @@ export default class BitcoinNetwork extends BaseNetwork {
         const path = `m/84'/0'/0'/0/0`; // BIP84 para SegWit nativo
         const child = root.derivePath(path);
 
+        // Convert Uint8Array to Buffer if needed
+        const privateKeyBuffer = Buffer.isBuffer(child.privateKey) 
+            ? child.privateKey 
+            : Buffer.from(child.privateKey);
+        
+        // Create ECPair from the private key buffer
+        const keyPair = ECPair.fromPrivateKey(privateKeyBuffer, { network: this.network });
+        
         const { address } = bitcoin.payments.p2wpkh({
-            pubkey: child.publicKey,
+            pubkey: keyPair.publicKey,
             network: this.network
         });
 
         return {
             address,
-            privateKey: child.toWIF(),
-            publicKey: child.publicKey.toString('hex'),
+            privateKey: keyPair.toWIF(),
+            publicKey: keyPair.publicKey.toString('hex'),
             mnemonic
         };
     }

package/network/lib/TONNetwork.js

@@ -137,32 +137,6 @@ export default class TONNetwork extends BaseNetwork {
         }));
     }
 
-    async getTokenBalances(address) {
-        const balances = [];
-        
-        // Add native TON balance
-        try {
-            const nativeBalance = await this.getBalance(address);
-            balances.push([this.config.nativeToken, nativeBalance]);
-        } catch (error) {
-            console.error('Failed to get TON balance:', error);
-            balances.push([this.config.nativeToken, 0]);
-        }
-
-        // Add token balances (not implemented yet)
-        for (const tokenSymbol in this.config.tokens) {
-            try {
-                const tokenBalance = await this.getTokenBalance(address, tokenSymbol);
-                balances.push([tokenSymbol, tokenBalance]);
-            } catch (error) {
-                console.error(`Failed to get ${tokenSymbol} balance:`, error);
-                balances.push([tokenSymbol, 0]);
-            }
-        }
-        
-        return balances;
-    }
-
     async sendSignedTransaction(signedTx) {
         // For TON, the transaction is already sent and signedTx contains the result
         let transactionHash;

package/network/lib/Web3Network.js

@@ -98,30 +98,21 @@ export default class Web3Network extends BaseNetwork {
         return this.transfer(account, recipient, amount, { gasLimit, gasPrice });
     }
 
-    async getTokenBalances(address) {
-        const balances = [];
-        
-        // Get native token balance
-        const nativeBalance = await this.getBalance(address);
-        balances.push([this.config.nativeToken, parseFloat(nativeBalance)]);
-
-        // Get balances for all configured tokens
-        for (const [symbol, tokenConfig] of Object.entries(this.config.tokens)) {
-            const contract = new this.web3.eth.Contract(
-                ERC20_ABI, 
-                tokenConfig.address
-            );
-            const balance = await contract.methods.balanceOf(address).call();
-            const decimals = await contract.methods.decimals().call();
-
-            const formattedBalance = Number(
-                (BigInt(balance) * 100n) / (10n ** BigInt(decimals))
-            ) / 100;
-
-            balances.push([symbol, formattedBalance]);
+    async getTokenBalance(address, tokenSymbol) {
+        if (tokenSymbol === this.config.nativeToken) {
+            return await this.getBalance(address);
         }
 
-        return balances;
+        const tokenConfig = this.config.tokens[tokenSymbol];
+        if (!tokenConfig) throw new Error(`Token ${tokenSymbol} not supported`);
+
+        const contract = new this.web3.eth.Contract(ERC20_ABI, tokenConfig.address);
+        const balance = await contract.methods.balanceOf(address).call();
+        const decimals = await contract.methods.decimals().call();
+
+        return Number(
+            (BigInt(balance) * 100n) / (10n ** BigInt(decimals))
+        ) / 100;
     }
 
     async privateKeyToAccount(privateKey) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hodl-wallet",
-    "version": "1.8.0",
+    "version": "1.8.4",
     "description": "🧊 HODL Wallet - Fast CLI crypto wallet!",
     "author": "Martin Clasen",
     "repository": {
@@ -29,6 +29,7 @@
         "bep20",
         "bnb",
         "eth",
+        "ton",
         "binance",
         "trust",
         "blockchain",