Phrase is normalized before checking for errors

[perso/Immae/Projets/Cryptomonnaies/BIP39.git] / bip39-standalone.html

diff --git a/bip39-standalone.html b/bip39-standalone.html
index 9bc6e88fbca0010202b3bebde6e7fa0aa6a9f43b..6125ce3d1849bb3c83d42d39ec00d90715817f32 100644 (file)
--- a/bip39-standalone.html
+++ b/bip39-standalone.html
@@ -52,15 +52,15 @@
             <hr>
             <div class="row">
                 <div class="col-md-12">
-                    <h2>Phrase</h2>
+                    <h2>Mnemonic</h2>
                     <form class="form-horizontal" role="form">
                         <div class="col-sm-2"></div>
                         <div class="col-sm-10">
-                            <p>You can enter an existing BIP39 phrase, or generate a new random one. Typing your own twelve words will probably not work how you expect, since the words require a particular structure (the last word is a checksum)</p>
+                            <p>You can enter an existing BIP39 mnemonic, or generate a new random one. Typing your own twelve words will probably not work how you expect, since the words require a particular structure (the last word is a checksum)</p>
                             <p>For more info see the <a href="https://github.com/bitcoin/bips/blob/master/bip-0039.mediawiki" target="_blank">BIP39 spec</a></p>
                         </div>
                         <div class="form-group">
-                            <label for="phrase" class="col-sm-2 control-label">BIP39 Phrase</label>
+                            <label for="phrase" class="col-sm-2 control-label">BIP39 Mnemonic</label>
                             <div class="col-sm-10">
                                 <textarea id="phrase" class="phrase form-control"></textarea>
                             </div>
@@ -71,7 +71,7 @@
                                 <div class="input-group">
                                     <input type="number" class="strength form-control" id="strength" value="12">
                                     <span class="input-group-btn">
-                                        <button class="btn generate">Generate Random Phrase</button>
+                                        <button class="btn generate">Generate Random Mnemonic</button>
                                     </span>
                                 </div>
                             </div>
@@ -340,7 +340,7 @@
         </div>
 
         <div class="feedback-container">
-            <div class="feedback"></div>
+            <div class="feedback">Loading...</div>
         </div>
 
         <script type="text/template" id="address-row-template">
@@ -22432,14 +22432,14 @@ var Mnemonic = function(language) {
 
     self.toSeed = function(mnemonic, passphrase) {
         passphrase = passphrase || '';
-        mnemonic = normalizeString(mnemonic)
-        passphrase = normalizeString(passphrase)
+        mnemonic = self.normalizeString(mnemonic)
+        passphrase = self.normalizeString(passphrase)
         passphrase = "mnemonic" + passphrase;
         //return PBKDF2(mnemonic, 'mnemonic' + passphrase, iterations=PBKDF2_ROUNDS, macmodule=hmac, digestmodule=hashlib.sha512).read(64)
         return asmCrypto.PBKDF2_HMAC_SHA512.hex(mnemonic, passphrase, PBKDF2_ROUNDS, 512/8);
     }
 
-    function normalizeString(str) {
+    self.normalizeString = function(str) {
         if (typeof str.normalize == "function") {
             return str.normalize("NFKD");
         }
@@ -22733,20 +22733,18 @@ WORDLISTS = {
     DOM.privateKeyToggle = $(".private-key-toggle");
 
     var derivationPath = DOM.bip44path.val();
-    var currentPhrase = DOM.phrase.val();
-    var currentPassphrase = DOM.passphrase.val();
 
     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);
@@ -22759,9 +22757,6 @@ WORDLISTS = {
     // Event handlers
 
     function delayedPhraseChanged() {
-        if (!hasChanged()) {
-            return;
-        }
         hideValidationError();
         showPending();
         if (phraseChangeTimeoutEvent != null) {
@@ -22791,9 +22786,6 @@ WORDLISTS = {
         calcBip32Seed(phrase, passphrase, derivationPath);
         displayBip32Info();
         hidePending();
-        // Set current state so we only update as needed
-        currentPhrase = phrase;
-        currentPassphrase = passphrase;
     }
 
     function generateClicked() {
@@ -22815,9 +22807,7 @@ WORDLISTS = {
     }
 
     function derivationChanged() {
-        hideValidationError();
-        showPending();
-        setTimeout(phraseChanged, 50);
+        delayedPhraseChanged();
     }
 
     function bip32Changed() {
@@ -22875,8 +22865,7 @@ WORDLISTS = {
 
     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("/");
@@ -22911,6 +22900,7 @@ WORDLISTS = {
     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++) {
@@ -22953,7 +22943,7 @@ WORDLISTS = {
             var index = i+ start;
             var key = bip32ExtendedKey.derive(index);
             var address = key.getAddress().toString();
-            var privkey = key.privKey.toWIF();
+            var privkey = key.privKey.toWIF(network);
             addAddressToList(index, address, privkey);
         }
     }
@@ -23046,12 +23036,6 @@ WORDLISTS = {
             .hide();
     }
 
-    function hasChanged() {
-        var phraseChanged = DOM.phrase.val() != currentPhrase;
-        var passphraseChanged = DOM.passphrase.val() != currentPassphrase;
-        return phraseChanged || passphraseChanged;
-    }
-
     init();
 
 })();