X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2Fjs%2Findex.js;h=0b34ade3b2bf17c432a5d4a71895cd76384da629;hb=40d542ba58008762c71a304df03ef8c987cb6db5;hp=23eaa4700e4ce016dab4c5d13211d9d1d27e6c06;hpb=909297015eea22c331facbee8c3d1aa84a998bb5;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git

diff --git a/src/js/index.js b/src/js/index.js
index 23eaa47..0b34ade 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -15,7 +15,6 @@
     var showPrivKey = true;
     var showQr = false;
     var litecoinUseLtub = true;
-    var isDefaultBip44ChangeValue = true;
 
     var entropyChangeTimeoutEvent = null;
     var phraseChangeTimeoutEvent = null;
@@ -45,8 +44,8 @@
     DOM.entropyWeakEntropyOverrideWarning = DOM.entropyContainer.find(".weak-entropy-override-warning");
     DOM.entropyFilterWarning = DOM.entropyContainer.find(".filter-warning");
     DOM.phrase = $(".phrase");
-	DOM.splitPhrase = $(".phraseSplit");
-	DOM.phraseSplitWarn = $(".phraseSplitWarn");
+    DOM.phraseSplit = $(".phraseSplit");
+    DOM.phraseSplitWarn = $(".phraseSplitWarn");
     DOM.passphrase = $(".passphrase");
     DOM.generateContainer = $(".generate-container");
     DOM.generate = $(".generate");
@@ -72,7 +71,6 @@
     DOM.bip44accountXprv = $("#bip44 .account-xprv");
     DOM.bip44accountXpub = $("#bip44 .account-xpub");
     DOM.bip44change = $("#bip44 .change");
-    DOM.defaultBip44ChangeValue = $("#bip44 .default-bip44-change-value");
     DOM.bip49unavailable = $("#bip49 .unavailable");
     DOM.bip49available = $("#bip49 .available");
     DOM.bip49path = $("#bip49-path");
@@ -138,9 +136,7 @@
         DOM.litecoinUseLtub.on("change", litecoinUseLtubChanged);
         DOM.bip32path.on("input", calcForDerivationPath);
         DOM.bip44account.on("input", calcForDerivationPath);
-        DOM.bip44change.on("input", modifiedDefaultBip44ChangeValue);
         DOM.bip44change.on("input", calcForDerivationPath);
-        DOM.defaultBip44ChangeValue.on("click", resetDefaultBip44ChangeValue);
         DOM.bip49account.on("input", calcForDerivationPath);
         DOM.bip49change.on("input", calcForDerivationPath);
         DOM.bip84account.on("input", calcForDerivationPath);
@@ -240,7 +236,7 @@
         }
         phraseChangeTimeoutEvent = setTimeout(function() {
             phraseChanged();
-            var entropy = mnemonic.toRawEntropyHex(DOM.phrase.val());
+            var entropy = mnemonic.toRawEntropyBin(DOM.phrase.val());
             if (entropy !== null) {
                 DOM.entropyMnemonicLength.val("raw");
                 DOM.entropy.val(entropy);
@@ -264,6 +260,7 @@
         calcForDerivationPath();
         // Show the word indexes
         showWordIndexes();
+        writeSplitPhrase(phrase);
     }
 
     function tabChanged() {
@@ -310,7 +307,7 @@
             clearDisplay();
             clearEntropyFeedback();
             DOM.phrase.val("");
-			DOM.phraseSplit.val("");
+            DOM.phraseSplit.val("");
             showValidationError("Blank entropy");
             return;
         }
@@ -345,7 +342,7 @@
         showPending();
         // Clear existing mnemonic and passphrase
         DOM.phrase.val("");
-		DOM.phraseSplit.val("");
+        DOM.phraseSplit.val("");
         DOM.passphrase.val("");
         seed = null;
         if (rootKeyChangedTimeoutEvent != null) {
@@ -432,7 +429,6 @@
             if (DOM.phrase.val().length > 0) {
                 var newPhrase = convertPhraseToNewLanguage();
                 DOM.phrase.val(newPhrase);
-				writeSplitPhrase(newPhrase);
                 phraseChanged();
             }
             else {
@@ -493,7 +489,6 @@
         // show the words
         var words = mnemonic.toMnemonic(data);
         DOM.phrase.val(words);
-		writeSplitPhrase(words);
         // show the entropy
         var entropyHex = uint8ArrayToHex(data);
         DOM.entropy.val(entropyHex);
@@ -743,14 +738,12 @@
             var purpose = parseIntNoNaN(DOM.bip44purpose.val(), 44);
             var coin = parseIntNoNaN(DOM.bip44coin.val(), 0);
             var account = parseIntNoNaN(DOM.bip44account.val(), 0);
-            var change = parseIntNoNaN(DOM.bip44change.val(), "");
-            var path = "m";
-            path += "/" + purpose + "'";
-            path += "/" + coin + "'";
-            path += "/" + account + "'";
-            if (change !== "") {
-              path += "/" + change;
-            }
+            var change = parseIntNoNaN(DOM.bip44change.val(), 0);
+            var path = "m/";
+            path += purpose + "'/";
+            path += coin + "'/";
+            path += account + "'/";
+            path += change;
             DOM.bip44path.val(path);
             var derivationPath = DOM.bip44path.val();
             console.log("Using derivation path from BIP44 tab: " + derivationPath);
@@ -1448,40 +1441,49 @@
         }
         return phrase;
     }
-	
-	function writeSplitPhrase(phrase) {
-		var wordCount = phrase.split(/\s/g).length;								//get number of words in phrase       
-		var left=[];															//initialize array of indexs
-		for (var i=0;i<wordCount;i++) left.push(i);								//add all indexs to array
-		var group=[[],[],[]],													//make array for 3 groups
-			groupI=-1;															//initialize group index
-		var seed = Math.abs(sjcl.hash.sha256.hash(phrase)[0])% 2147483647;		//start seed at sudo random value based on hash of words
-		while (left.length>0) {													//while indexs left
-			groupI=(groupI+1)%3;												//get next group to insert index into
-			seed = seed * 16807 % 2147483647;									//change random value.(simple predicatable random number generator works well for this use)
-			var selected=Math.floor(left.length*(seed - 1) / 2147483646);		//get index in left we will use for this group
-			group[groupI].push(left[selected]);									//add index to group
-			left.splice(selected,1);											//remove selected index
-		}
-		var cards=[phrase.split(/\s/g),phrase.split(/\s/g),phrase.split(/\s/g)];//make array of cards
-		for (var i=0;i<3;i++) {													//go through each card
-			for (var ii=0;ii<wordCount/3;ii++) cards[i][group[i][ii]]='XXXX';	//erase words listed in the group
-			cards[i]='Card '+(i+1)+': '+wordArrayToPhrase(cards[i]);								//combine words on card back to string
-		}
-		DOM.splitPhrase.val(cards.join("\r\n"));								//make words visible
-		var triesPerSecond=10000000000;											//assumed number of tries per second
-		var hackTime=Math.pow(2,wordCount*10/3)/triesPerSecond;					//get number of bits of unknown data per card
-		if (hackTime<1) {
-			hackTime="<1 second";
-		} else if (hackTime<86400) {
-			hackTime=Math.floor(hackTime)+" seconds";
-		} else if(hackTime<31557600) {
-			hackTime=Math.floor(hackTime/86400)+" days";
-		} else {
-			hackTime=Math.floor(hackTime/31557600)+" years";
-		}
-		DOM.phraseSplitWarn.html("Time to hack with only one card: "+hackTime);
-	}
+
+    function writeSplitPhrase(phrase) {
+        var wordCount = phrase.split(/\s/g).length;
+        var left=[];
+        for (var i=0;i<wordCount;i++) left.push(i);
+        var group=[[],[],[]],
+            groupI=-1;
+        var seed = Math.abs(sjcl.hash.sha256.hash(phrase)[0])% 2147483647;
+        while (left.length>0) {
+            groupI=(groupI+1)%3;
+            seed = seed * 16807 % 2147483647;
+            var selected=Math.floor(left.length*(seed - 1) / 2147483646);
+            group[groupI].push(left[selected]);
+            left.splice(selected,1);
+        }
+        var cards=[phrase.split(/\s/g),phrase.split(/\s/g),phrase.split(/\s/g)];
+        for (var i=0;i<3;i++) {
+            for (var ii=0;ii<wordCount/3;ii++) cards[i][group[i][ii]]='XXXX';
+            cards[i]='Card '+(i+1)+': '+wordArrayToPhrase(cards[i]);
+        }
+        DOM.phraseSplit.val(cards.join("\r\n"));
+        var triesPerSecond=10000000000;
+        var hackTime=Math.pow(2,wordCount*10/3)/triesPerSecond;
+        var displayRedText = false;
+        if (hackTime<1) {
+            hackTime="<1 second";
+            displayRedText = true;
+        } else if (hackTime<86400) {
+            hackTime=Math.floor(hackTime)+" seconds";
+            displayRedText = true;
+        } else if(hackTime<31557600) {
+            hackTime=Math.floor(hackTime/86400)+" days";
+            displayRedText = true;
+        } else {
+            hackTime=Math.floor(hackTime/31557600)+" years";
+        }
+        DOM.phraseSplitWarn.html("Time to hack with only one card: "+hackTime);
+        if (displayRedText) {
+            DOM.phraseSplitWarn.addClass("text-danger");
+        } else {
+            DOM.phraseSplitWarn.removeClass("text-danger");
+        }
+    }
 
     function isUsingOwnEntropy() {
         return DOM.useEntropy.prop("checked");
@@ -1540,7 +1542,7 @@
         var phrase = mnemonic.toMnemonic(entropyArr);
         // Set the mnemonic in the UI
         DOM.phrase.val(phrase);
-		writeSplitPhrase(phrase);
+        writeSplitPhrase(phrase);
         // Show the word indexes
         showWordIndexes();
         // Show the checksum
@@ -1750,30 +1752,10 @@
         return DOM.bip141tab.hasClass("active");
     }
 
-    function setBip44ChangeValue() {
-        if (isDefaultBip44ChangeValue) {
-            if (networkIsEthereum()) {
-                DOM.bip44change.val("");
-            } else {
-                DOM.bip44change.val(0);
-            }
-        }
-    }
-
-    function modifiedDefaultBip44ChangeValue() {
-        isDefaultBip44ChangeValue = false;
-    }
-
-    function resetDefaultBip44ChangeValue() {
-        isDefaultBip44ChangeValue = true;
-        setBip44ChangeValue();
-    }
-
     function setHdCoin(coinValue) {
         DOM.bip44coin.val(coinValue);
         DOM.bip49coin.val(coinValue);
         DOM.bip84coin.val(coinValue);
-        setBip44ChangeValue();
     }
 
     function showSegwitAvailable() {
@@ -1936,8 +1918,8 @@
                 network = bitcoinjs.bitcoin.networks.axe;
                 setHdCoin(4242);
             },
-		},
-		{
+        },
+        {
             name: "ANON - ANON",
             onSelect: function() {
                 network = bitcoinjs.bitcoin.networks.anon;
@@ -1993,7 +1975,7 @@
                 setHdCoin(2941);
             },
         },
-		{
+        {
             name: "tBND - Blocknode Testnet",
             onSelect: function() {
                 network = bitcoinjs.bitcoin.networks.blocknode_testnet;
@@ -2014,7 +1996,7 @@
                 setHdCoin(91);
             },
         },
-		{
+        {
             name: "BST - BlockStamp",
             onSelect: function() {
                 network = bitcoinjs.bitcoin.networks.blockstamp;
@@ -2042,7 +2024,7 @@
                 setHdCoin(1);
             },
         },
-		{
+        {
             name: "BITG - Bitcoin Green",
             onSelect: function() {
                 network = bitcoinjs.bitcoin.networks.bitcoingreen;
@@ -2446,14 +2428,14 @@
                 setHdCoin(168);
             },
         },
-		{
+        {
             name: "HUSH - Hush (Legacy)",
             onSelect: function() {
                 network = bitcoinjs.bitcoin.networks.hush;
                 setHdCoin(197);
             },
         },
-		{
+        {
             name: "HUSH - Hush3",
             onSelect: function() {
                 network = bitcoinjs.bitcoin.networks.hush3;
@@ -2733,7 +2715,7 @@
                 setHdCoin(174);
             },
         },
-		{
+        {
             name: "PHR - Phore",
             onSelect: function() {
                 network = bitcoinjs.bitcoin.networks.phore;
@@ -2798,7 +2780,7 @@
                 setHdCoin(6);
             },
         },
-		{
+        {
             name: "PRJ - ProjectCoin",
             onSelect: function() {
                 network = bitcoinjs.bitcoin.networks.projectcoin;
@@ -2861,7 +2843,7 @@
               setHdCoin(19165);
             },
         },
-	{
+    {
           name: "SLS - Salus",
           onSelect: function() {
               network = bitcoinjs.bitcoin.networks.salus;
@@ -2959,6 +2941,13 @@
                 setHdCoin(113);
             },
         },
+        {
+            name: "THT - Thought",
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.thought;
+                setHdCoin(1618);
+            },
+        },
         {
             name: "TOA - Toa",
             onSelect: function() {
@@ -3057,7 +3046,7 @@
                 setHdCoin(181);
             },
         },
-		{
+        {
             name: "XAX - Artax",
             onSelect: function() {
                 network = bitcoinjs.bitcoin.networks.artax;