X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git;a=blobdiff_plain;f=src%2Fjs%2Findex.js;h=d169ed28dc2ebcd808c2d1ec9edbb0b1455d3280;hp=9ace962612267c779c264895031634ae3ca9ee74;hb=f12242014d1ed5c7606c3350a9780c3883abc565;hpb=c7a092db32f161fe3f205493dafc54bd02627f84

diff --git a/src/js/index.js b/src/js/index.js
index 9ace962..d169ed2 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -16,6 +16,7 @@
     var showQr = false;
     var litecoinUseLtub = true;
 
+    var entropyTypeAutoDetect = true;
     var entropyChangeTimeoutEvent = null;
     var phraseChangeTimeoutEvent = null;
     var rootKeyChangedTimeoutEvent = null;
@@ -32,6 +33,7 @@
     DOM.entropy = $(".entropy");
     DOM.entropyFiltered = DOM.entropyContainer.find(".filtered");
     DOM.entropyType = DOM.entropyContainer.find(".type");
+    DOM.entropyTypeInputs = DOM.entropyContainer.find("input[name='entropy-type']");
     DOM.entropyCrackTime = DOM.entropyContainer.find(".crack-time");
     DOM.entropyEventCount = DOM.entropyContainer.find(".event-count");
     DOM.entropyBits = DOM.entropyContainer.find(".bits");
@@ -44,8 +46,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");
@@ -128,6 +130,7 @@
         DOM.useEntropy.on("change", setEntropyVisibility);
         DOM.entropy.on("input", delayedEntropyChanged);
         DOM.entropyMnemonicLength.on("change", entropyChanged);
+        DOM.entropyTypeInputs.on("change", entropyTypeChanged);
         DOM.phrase.on("input", delayedPhraseChanged);
         DOM.passphrase.on("input", delayedPhraseChanged);
         DOM.generate.on("click", generateClicked);
@@ -240,6 +243,8 @@
             if (entropy !== null) {
                 DOM.entropyMnemonicLength.val("raw");
                 DOM.entropy.val(entropy);
+                DOM.entropyTypeInputs.filter("[value='hexadecimal']").prop("checked", true);
+                entropyTypeAutoDetect = false;
             }
         }, 400);
     }
@@ -260,6 +265,7 @@
         calcForDerivationPath();
         // Show the word indexes
         showWordIndexes();
+        writeSplitPhrase(phrase);
     }
 
     function tabChanged() {
@@ -306,7 +312,7 @@
             clearDisplay();
             clearEntropyFeedback();
             DOM.phrase.val("");
-			DOM.phraseSplit.val("");
+            DOM.phraseSplit.val("");
             showValidationError("Blank entropy");
             return;
         }
@@ -329,6 +335,11 @@
         }
     }
 
+    function entropyTypeChanged() {
+        entropyTypeAutoDetect = false;
+        entropyChanged();
+    }
+
     function delayedRootKeyChanged() {
         // Warn if there is an existing mnemonic or passphrase.
         if (DOM.phrase.val().length > 0 || DOM.passphrase.val().length > 0) {
@@ -341,7 +352,7 @@
         showPending();
         // Clear existing mnemonic and passphrase
         DOM.phrase.val("");
-		DOM.phraseSplit.val("");
+        DOM.phraseSplit.val("");
         DOM.passphrase.val("");
         seed = null;
         if (rootKeyChangedTimeoutEvent != null) {
@@ -428,7 +439,6 @@
             if (DOM.phrase.val().length > 0) {
                 var newPhrase = convertPhraseToNewLanguage();
                 DOM.phrase.val(newPhrase);
-				writeSplitPhrase(newPhrase);
                 phraseChanged();
             }
             else {
@@ -489,7 +499,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);
@@ -540,6 +549,22 @@
                 }
                 catch (e) {}
             }
+            // try parsing using p2wsh network params
+            if ("p2wsh" in n) {
+                try {
+                    bip32RootKey = bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58, n.p2wsh);
+                    return;
+                }
+                catch (e) {}
+            }
+            // try parsing using p2wsh-in-p2sh network params
+            if ("p2wshInP2sh" in n) {
+                try {
+                    bip32RootKey = bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58, n.p2wshInP2sh);
+                    return;
+                }
+                catch (e) {}
+            }
         }
         // try the network params as currently specified
         bip32RootKey = bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58, network);
@@ -682,6 +707,22 @@
                 }
                 catch (e) {}
             }
+            // try parsing using p2wsh network params
+            if ("p2wsh" in n) {
+                try {
+                    bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58, n.p2wsh);
+                    return "";
+                }
+                catch (e) {}
+            }
+            // try parsing using p2wsh-in-p2sh network params
+            if ("p2wshInP2sh" in n) {
+                try {
+                    bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58, n.p2wshInP2sh);
+                    return "";
+                }
+                catch (e) {}
+            }
         }
         // try the network params as currently specified
         try {
@@ -969,6 +1010,14 @@
             (bip141TabSelected() && DOM.bip141semantics.val() == "p2wpkh-p2sh");
     }
 
+    function p2wshSelected() {
+        return bip141TabSelected() && DOM.bip141semantics.val() == "p2wsh";
+    }
+
+    function p2wshInP2shSelected() {
+        return (bip141TabSelected() && DOM.bip141semantics.val() == "p2wsh-p2sh");
+    }
+
     function TableRow(index, isLast) {
 
         var self = this;
@@ -980,6 +1029,8 @@
         var segwitAvailable = networkHasSegwit();
         var isP2wpkh = p2wpkhSelected();
         var isP2wpkhInP2sh = p2wpkhInP2shSelected();
+        var isP2wsh = p2wshSelected();
+        var isP2wshInP2sh = p2wshInP2shSelected();
 
         function init() {
             calculateValues();
@@ -1034,20 +1085,7 @@
                     indexText = indexText + "'";
                 }
                 // Ethereum values are different
-                if ((networks[DOM.network.val()].name == "ETH - Ethereum")
-                    || (networks[DOM.network.val()].name == "ETC - Ethereum Classic")
-                    || (networks[DOM.network.val()].name == "EWT - EnergyWeb")
-                    || (networks[DOM.network.val()].name == "PIRL - Pirl")
-                    || (networks[DOM.network.val()].name == "MIX - MIX")
-                    || (networks[DOM.network.val()].name == "MUSIC - Musicoin")
-                    || (networks[DOM.network.val()].name == "POA - Poa")
-                    || (networks[DOM.network.val()].name == "EXP - Expanse")
-                    || (networks[DOM.network.val()].name == "CLO - Callisto")
-                    || (networks[DOM.network.val()].name == "DXN - DEXON")
-                    || (networks[DOM.network.val()].name == "ELLA - Ellaism")
-                    || (networks[DOM.network.val()].name == "ESN - Ethersocial Network")
-                    || (networks[DOM.network.val()].name == "VET - VeChain")
-                ) {
+                if (networkIsEthereum()) {
                     var privKeyBuffer = keyPair.d.toBuffer(32);
                     privkey = privKeyBuffer.toString('hex');
                     var addressBuffer = ethUtil.privateToAddress(privKeyBuffer);
@@ -1123,6 +1161,21 @@
                         var scriptpubkey = bitcoinjs.bitcoin.script.scriptHash.output.encode(addressbytes);
                         address = bitcoinjs.bitcoin.address.fromOutputScript(scriptpubkey, network)
                     }
+                    else if (isP2wsh) {
+                        // https://github.com/bitcoinjs/bitcoinjs-lib/blob/v3.3.2/test/integration/addresses.js#L71
+                        // This is a 1-of-1
+                        var witnessScript = bitcoinjs.bitcoin.script.multisig.output.encode(1, [key.getPublicKeyBuffer()]);
+                        var scriptPubKey = bitcoinjs.bitcoin.script.witnessScriptHash.output.encode(bitcoinjs.bitcoin.crypto.sha256(witnessScript));
+                        address = bitcoinjs.bitcoin.address.fromOutputScript(scriptPubKey, network);
+                    }
+                    else if (isP2wshInP2sh) {
+                        // https://github.com/bitcoinjs/bitcoinjs-lib/blob/v3.3.2/test/integration/transactions.js#L183
+                        // This is a 1-of-1
+                        var witnessScript = bitcoinjs.bitcoin.script.multisig.output.encode(1, [key.getPublicKeyBuffer()]);
+                        var redeemScript = bitcoinjs.bitcoin.script.witnessScriptHash.output.encode(bitcoinjs.bitcoin.crypto.sha256(witnessScript));
+                        var scriptPubKey = bitcoinjs.bitcoin.script.scriptHash.output.encode(bitcoinjs.bitcoin.crypto.hash160(redeemScript));
+                        address = bitcoinjs.bitcoin.address.fromOutputScript(scriptPubKey, network)
+                    }
                 }
 
                 if ((networks[DOM.network.val()].name == "CRW - Crown")) {
@@ -1455,40 +1508,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");
@@ -1499,7 +1561,14 @@
         // Get entropy value
         var entropyStr = DOM.entropy.val();
         // Work out minimum base for entropy
-        var entropy = Entropy.fromString(entropyStr);
+        var entropy = null;
+        if (entropyTypeAutoDetect) {
+            entropy = Entropy.fromString(entropyStr);
+        }
+        else {
+            let base = DOM.entropyTypeInputs.filter(":checked").val();
+            entropy = Entropy.fromString(entropyStr, base);
+        }
         if (entropy.binaryStr.length == 0) {
             return;
         }
@@ -1547,7 +1616,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
@@ -1580,6 +1649,8 @@
             console.log(e);
         }
         var entropyTypeStr = getEntropyTypeStr(entropy);
+        DOM.entropyTypeInputs.attr("checked", false);
+        DOM.entropyTypeInputs.filter("[value='" + entropyTypeStr + "']").attr("checked", true);
         var wordCount = Math.floor(numberOfBits / 32) * 3;
         var bitsPerEvent = entropy.bitsPerEvent.toFixed(2);
         var spacedBinaryStr = addSpacesEveryElevenBits(entropy.binaryStr);
@@ -1711,6 +1782,23 @@
         return DOM.bip32tab.hasClass("active");
     }
 
+    function networkIsEthereum() {
+        var name = networks[DOM.network.val()].name;
+        return (name == "ETH - Ethereum")
+                    || (name == "ETC - Ethereum Classic")
+                    || (name == "EWT - EnergyWeb")
+                    || (name == "PIRL - Pirl")
+                    || (name == "MIX - MIX")
+                    || (name == "MUSIC - Musicoin")
+                    || (name == "POA - Poa")
+                    || (name == "EXP - Expanse")
+                    || (name == "CLO - Callisto")
+                    || (name == "DXN - DEXON")
+                    || (name == "ELLA - Ellaism")
+                    || (name == "ESN - Ethersocial Network")
+                    || (name == "VET - VeChain")
+    }
+
     function networkHasSegwit() {
         var n = network;
         if ("baseNetwork" in network) {
@@ -1782,6 +1870,12 @@
         else if (p2wpkhInP2shSelected() && "p2wpkhInP2sh" in network) {
             network = network.p2wpkhInP2sh;
         }
+        else if (p2wshSelected() && "p2wsh" in network) {
+            network = network.p2wsh;
+        }
+        else if (p2wshInP2shSelected() && "p2wshInP2sh" in network) {
+            network = network.p2wshInP2sh;
+        }
     }
 
     function lastIndexInTable() {
@@ -1906,8 +2000,8 @@
                 network = bitcoinjs.bitcoin.networks.axe;
                 setHdCoin(4242);
             },
-		},
-		{
+        },
+        {
             name: "ANON - ANON",
             onSelect: function() {
                 network = bitcoinjs.bitcoin.networks.anon;
@@ -1963,7 +2057,7 @@
                 setHdCoin(2941);
             },
         },
-		{
+        {
             name: "tBND - Blocknode Testnet",
             onSelect: function() {
                 network = bitcoinjs.bitcoin.networks.blocknode_testnet;
@@ -1984,7 +2078,7 @@
                 setHdCoin(91);
             },
         },
-		{
+        {
             name: "BST - BlockStamp",
             onSelect: function() {
                 network = bitcoinjs.bitcoin.networks.blockstamp;
@@ -2005,6 +2099,15 @@
                 setHdCoin(0);
             },
         },
+        {
+            name: "BTC - Bitcoin RegTest",
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.regtest;
+                // Using hd coin value 1 based on bip44_coin_type
+                // https://github.com/chaintope/bitcoinrb/blob/f1014406f6b8f9b4edcecedc18df70c80df06f11/lib/bitcoin/chainparams/regtest.yml
+                setHdCoin(1);
+            },
+        },
         {
             name: "BTC - Bitcoin Testnet",
             onSelect: function() {
@@ -2012,7 +2115,7 @@
                 setHdCoin(1);
             },
         },
-		{
+        {
             name: "BITG - Bitcoin Green",
             onSelect: function() {
                 network = bitcoinjs.bitcoin.networks.bitcoingreen;
@@ -2416,14 +2519,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;
@@ -2703,7 +2806,7 @@
                 setHdCoin(174);
             },
         },
-		{
+        {
             name: "PHR - Phore",
             onSelect: function() {
                 network = bitcoinjs.bitcoin.networks.phore;
@@ -2768,7 +2871,7 @@
                 setHdCoin(6);
             },
         },
-		{
+        {
             name: "PRJ - ProjectCoin",
             onSelect: function() {
                 network = bitcoinjs.bitcoin.networks.projectcoin;
@@ -2831,7 +2934,7 @@
               setHdCoin(19165);
             },
         },
-	{
+    {
           name: "SLS - Salus",
           onSelect: function() {
               network = bitcoinjs.bitcoin.networks.salus;
@@ -2929,6 +3032,13 @@
                 setHdCoin(113);
             },
         },
+        {
+            name: "THT - Thought",
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.thought;
+                setHdCoin(1618);
+            },
+        },
         {
             name: "TOA - Toa",
             onSelect: function() {
@@ -3027,7 +3137,7 @@
                 setHdCoin(181);
             },
         },
-		{
+        {
             name: "XAX - Artax",
             onSelect: function() {
                 network = bitcoinjs.bitcoin.networks.artax;