X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2Fjs%2Findex.js;h=81958fc7acf75c80dc358e161bfe60c6f869df19;hb=700901cd01d5687ac7b35ec21daf1bbf1fe363a2;hp=cee8ffbac5d36a557208e6058dd5445420f20d99;hpb=59780293832d7a27d34378d4e47e7995f7d154a0;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git

diff --git a/src/js/index.js b/src/js/index.js
index cee8ffb..81958fc 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -6,6 +6,10 @@
     var network = Bitcoin.networks.bitcoin;
     var addressRowTemplate = $("#address-row-template");
 
+    var showIndex = true;
+    var showAddress = true;
+    var showPrivKey = true;
+
     var phraseChangeTimeoutEvent = null;
 
     var DOM = {};
@@ -35,15 +39,15 @@
 
     function init() {
         // Events
-        DOM.phrase.on("keyup", delayedPhraseChanged);
-        DOM.passphrase.on("keyup", delayedPhraseChanged);
+        DOM.phrase.on("input", delayedPhraseChanged);
+        DOM.passphrase.on("input", delayedPhraseChanged);
         DOM.generate.on("click", generateClicked);
         DOM.more.on("click", showMore);
-        DOM.bip32path.on("keyup", bip32Changed);
-        DOM.bip44purpose.on("keyup", bip44Changed);
-        DOM.bip44coin.on("keyup", bip44Changed);
-        DOM.bip44account.on("keyup", bip44Changed);
-        DOM.bip44change.on("keyup", bip44Changed);
+        DOM.bip32path.on("input", bip32Changed);
+        DOM.bip44purpose.on("input", bip44Changed);
+        DOM.bip44coin.on("input", bip44Changed);
+        DOM.bip44account.on("input", bip44Changed);
+        DOM.bip44change.on("input", bip44Changed);
         DOM.tab.on("click", tabClicked);
         DOM.indexToggle.on("click", toggleIndexes);
         DOM.addressToggle.on("click", toggleAddresses);
@@ -121,14 +125,17 @@
     }
 
     function toggleIndexes() {
+        showIndex = !showIndex;
         $("td.index span").toggleClass("invisible");
     }
 
     function toggleAddresses() {
+        showAddress = !showAddress;
         $("td.address span").toggleClass("invisible");
     }
 
     function togglePrivateKeys() {
+        showPrivKey = !showPrivKey;
         $("td.privkey span").toggleClass("invisible");
     }
 
@@ -164,8 +171,7 @@
 
     function calcBip32Seed(phrase, passphrase, path) {
         var seed = mnemonic.toSeed(phrase, passphrase);
-        var seedHash = Bitcoin.crypto.sha256(seed).toString("hex");
-        bip32RootKey = Bitcoin.HDNode.fromSeedHex(seedHash, network);
+        bip32RootKey = Bitcoin.HDNode.fromSeedHex(seed, network);
         bip32ExtendedKey = bip32RootKey;
         // Derive the key from the path
         var pathBits = path.split("/");
@@ -200,6 +206,7 @@
     function findPhraseErrors(phrase) {
         // TODO make this right
         // Preprocess the words
+        phrase = mnemonic.normalizeString(phrase);
         var parts = phrase.split(" ");
         var proper = [];
         for (var i=0; i<parts.length; i++) {
@@ -239,12 +246,28 @@
 
     function displayAddresses(start, total) {
         for (var i=0; i<total; i++) {
-            var index = i+ start;
-            var key = bip32ExtendedKey.derive(index);
-            var address = key.getAddress().toString();
-            var privkey = key.privKey.toWIF();
-            addAddressToList(index, address, privkey);
+            var index = i + start;
+            new TableRow(index);
+        }
+    }
+
+    function TableRow(index) {
+
+        function init() {
+            calculateValues();
+        }
+
+        function calculateValues() {
+            setTimeout(function() {
+                var key = bip32ExtendedKey.derive(index);
+                var address = key.getAddress().toString();
+                var privkey = key.privKey.toWIF(network);
+                addAddressToList(index, address, privkey);
+            }, 50)
         }
+
+        init();
+
     }
 
     function showMore() {
@@ -261,11 +284,7 @@
                 return;
             }
         }
-        showPending();
-        setTimeout(function() {
         displayAddresses(start, rowsToAdd);
-        hidePending();
-        }, 50);
     }
 
     function clearDisplay() {
@@ -286,9 +305,24 @@
 
     function addAddressToList(index, address, privkey) {
         var row = $(addressRowTemplate.html());
-        row.find(".index span").text(index);
-        row.find(".address span").text(address);
-        row.find(".privkey span").text(privkey);
+        // Elements
+        var indexCell = row.find(".index span");
+        var addressCell = row.find(".address span");
+        var privkeyCell = row.find(".privkey span");
+        // Content
+        indexCell.text(index);
+        addressCell.text(address);
+        privkeyCell.text(privkey);
+        // Visibility
+        if (!showIndex) {
+            indexCell.addClass("invisible");
+        }
+        if (!showAddress) {
+            addressCell.addClass("invisible");
+        }
+        if (!showPrivKey) {
+            privkeCell.addClass("invisible");
+        }
         DOM.addresses.append(row);
     }