Addresses shown in table as they're calculated

[perso/Immae/Projets/Cryptomonnaies/BIP39.git] / src / js / index.js

diff --git a/src/js/index.js b/src/js/index.js
index cee8ffbac5d36a557208e6058dd5445420f20d99..f8b67616c530af1ae84c873a7302f6d59781ac20 100644 (file)
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -35,15 +35,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);
@@ -164,8 +164,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 +199,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,14 +239,30 @@
 
     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() {
         var start = DOM.addresses.children().length;
         var rowsToAdd = parseInt(DOM.rowsToAdd.val());
@@ -261,11 +277,7 @@
                 return;
             }
         }
-        showPending();
-        setTimeout(function() {
         displayAddresses(start, rowsToAdd);
-        hidePending();
-        }, 50);
     }
 
     function clearDisplay() {