X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2Fjs%2Findex.js;h=45f378de867174fb710f54c5c8dd0b9ab93c6a8b;hb=1cf1bbaff575e647ef38b091a00edfa2e1ce024d;hp=cd7f281b5489f8e1a956a19fb4784e3fa3c1cb8c;hpb=c6624d51f4e5607202e48903352574c47571baab;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git

diff --git a/src/js/index.js b/src/js/index.js
index cd7f281..45f378d 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -24,7 +24,14 @@
     DOM.useEntropy = $(".use-entropy");
     DOM.entropyContainer = $(".entropy-container");
     DOM.entropy = $(".entropy");
-    DOM.entropyError = $(".entropy-error");
+    DOM.entropyFeedback = $(".entropy-feedback");
+    DOM.entropyFiltered = DOM.entropyFeedback.find(".filtered");
+    DOM.entropyType = DOM.entropyFeedback.find(".type");
+    DOM.entropyStrength = DOM.entropyFeedback.find(".strength");
+    DOM.entropyEventCount = DOM.entropyFeedback.find(".event-count");
+    DOM.entropyBits = DOM.entropyFeedback.find(".bits");
+    DOM.entropyBitsPerEvent = DOM.entropyFeedback.find(".bits-per-event");
+    DOM.entropyMnemonicLength = DOM.entropyFeedback.find(".mnemonic-length");
     DOM.phrase = $(".phrase");
     DOM.passphrase = $(".passphrase");
     DOM.generateContainer = $(".generate-container");
@@ -43,7 +50,7 @@
     DOM.bip44coin = $("#bip44 .coin");
     DOM.bip44account = $("#bip44 .account");
     DOM.bip44change = $("#bip44 .change");
-    DOM.strength = $(".strength");
+    DOM.generatedStrength = $(".generate-container .strength");
     DOM.hardenedAddresses = $(".hardened-addresses");
     DOM.addresses = $(".addresses");
     DOM.rowsToAdd = $(".rows-to-add");
@@ -109,6 +116,7 @@
             DOM.entropyContainer.addClass("hidden");
             DOM.generateContainer.removeClass("hidden");
             DOM.phrase.prop("readonly", false);
+            hidePending();
         }
     }
 
@@ -149,8 +157,31 @@
     }
 
     function entropyChanged() {
+        // If blank entropy, clear mnemonic, addresses, errors
+        if (DOM.entropy.val().trim().length == 0) {
+            clearDisplay();
+            hideEntropyFeedback();
+            DOM.phrase.val("");
+            showValidationError("Blank entropy");
+            return;
+        }
+        // Get the current phrase to detect changes
+        var phrase = DOM.phrase.val();
+        // Set the phrase from the entropy
         setMnemonicFromEntropy();
-        phraseChanged();
+        // Recalc addresses if the phrase has changed
+        var newPhrase = DOM.phrase.val();
+        if (newPhrase != phrase) {
+            if (newPhrase.length == 0) {
+                clearDisplay();
+            }
+            else {
+                phraseChanged();
+            }
+        }
+        else {
+            hidePending();
+        }
     }
 
     function delayedRootKeyChanged() {
@@ -262,7 +293,7 @@
             showValidationError(errorText);
             return;
         }
-        var numWords = parseInt(DOM.strength.val());
+        var numWords = parseInt(DOM.generatedStrength.val());
         var strength = numWords / 3 * 32;
         var words = mnemonic.generate(strength);
         DOM.phrase.val(words);
@@ -311,10 +342,13 @@
     }
 
     function findPhraseErrors(phrase) {
-        // TODO make this right
         // Preprocess the words
         phrase = mnemonic.normalizeString(phrase);
         var words = phraseToWordArray(phrase);
+        // Detect blank phrase
+        if (words.length == 0) {
+            return "Blank mnemonic";
+        }
         // Check each word
         for (var i=0; i<words.length; i++) {
             var word = words[i];
@@ -700,43 +734,24 @@
     }
 
     function setMnemonicFromEntropy() {
-        hideEntropyError();
-        // Work out minimum base for entropy
+        hideEntropyFeedback();
+        // Get entropy value
         var entropyStr = DOM.entropy.val();
+        // Work out minimum base for entropy
         var entropy = Entropy.fromString(entropyStr);
-        if (entropy.hexStr.length == 0) {
+        if (entropy.binaryStr.length == 0) {
             return;
         }
         // Show entropy details
-        var extraBits = 32 - (entropy.binaryStr.length % 32);
-        var extraChars = Math.ceil(extraBits * Math.log(2) / Math.log(entropy.base.asInt));
-        var strength = "an extremely weak";
-        if (entropy.hexStr.length >= 8) {
-            strength = "a very weak";
-        }
-        if (entropy.hexStr.length >= 12) {
-            strength = "a weak";
-        }
-        if (entropy.hexStr.length >= 24) {
-            strength = "a strong";
-        }
-        if (entropy.hexStr.length >= 32) {
-            strength = "a very strong";
-        }
-        if (entropy.hexStr.length >= 40) {
-            strength = "an extremely strong";
-        }
-        if (entropy.hexStr.length >=48) {
-            strength = "an even stronger"
-        }
-        var msg = "Have " + entropy.binaryStr.length + " bits of entropy, " + extraChars + " more " + entropy.base.str + " chars required to generate " + strength + " mnemonic: " + entropy.cleanStr;
-        showEntropyError(msg);
+        showEntropyFeedback(entropy);
         // Discard trailing entropy
-        var hexStr = entropy.hexStr.substring(0, Math.floor(entropy.hexStr.length / 8) * 8);
+        var bitsToUse = Math.floor(entropy.binaryStr.length / 32) * 32;
+        var binaryStr = entropy.binaryStr.substring(0, bitsToUse);
         // Convert entropy string to numeric array
         var entropyArr = [];
-        for (var i=0; i<hexStr.length / 2; i++) {
-            var entropyByte = parseInt(hexStr[i*2].concat(hexStr[i*2+1]), 16);
+        for (var i=0; i<binaryStr.length / 8; i++) {
+            var byteAsBits = binaryStr.substring(i*8, i*8+8);
+            var entropyByte = parseInt(byteAsBits, 2);
             entropyArr.push(entropyByte)
         }
         // Convert entropy array to mnemonic
@@ -745,13 +760,44 @@
         DOM.phrase.val(phrase);
     }
 
-    function hideEntropyError() {
-        DOM.entropyError.addClass("hidden");
+    function hideEntropyFeedback() {
+        DOM.entropyFeedback.addClass("hidden");
+        DOM.entropyFiltered.text("");
+        DOM.entropyType.text("");
+        DOM.entropyStrength.text("");
+        DOM.entropyEventCount.text("");
+        DOM.entropyBits.text("");
+        DOM.entropyBitsPerEvent.text("");
     }
 
-    function showEntropyError(msg) {
-        DOM.entropyError.text(msg);
-        DOM.entropyError.removeClass("hidden");
+    function showEntropyFeedback(entropy) {
+        var strength = "extremely weak";
+        if (entropy.binaryStr.length >= 64) {
+            strength = "very weak";
+        }
+        if (entropy.binaryStr.length >= 96) {
+            strength = "weak";
+        }
+        if (entropy.binaryStr.length >= 128) {
+            strength = "strong";
+        }
+        if (entropy.binaryStr.length >= 160) {
+            strength = "very strong";
+        }
+        if (entropy.binaryStr.length >= 192) {
+            strength = "extremely strong";
+        }
+        var bitsStr = entropy.binaryStr.length;
+        if (entropy.base.asInt != 2) {
+            bitsStr += " (" + entropy.binaryStr + ")";
+        }
+        DOM.entropyFiltered.text(entropy.cleanStr);
+        DOM.entropyType.text(entropy.base.str);
+        DOM.entropyStrength.text(strength);
+        DOM.entropyEventCount.text(entropy.base.ints.length);
+        DOM.entropyBits.text(bitsStr);
+        DOM.entropyBitsPerEvent.text(Math.log2(entropy.base.asInt).toFixed(2));
+        DOM.entropyFeedback.removeClass("hidden");
     }
 
     var networks = [