X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git;a=blobdiff_plain;f=src%2Fjs%2Findex.js;h=fc467fe55188f9428dbec3d57377e430a07afc4c;hp=dc10d597e84ef8a768072e23fc0eca411147c1c0;hb=e9491c7efd88b23fc505f546845f52bfbb7fd864;hpb=de5fe245ccc5b333efcf772d19d8965ffeb47272 diff --git a/src/js/index.js b/src/js/index.js index dc10d59..fc467fe 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -6,7 +6,7 @@ var seed = null; var bip32RootKey = null; var bip32ExtendedKey = null; - var network = bitcoinjs.bitcoin.networks.bitcoin; + var network = libs.bitcoin.networks.bitcoin; var addressRowTemplate = $("#address-row-template"); var showIndex = true; @@ -16,8 +16,10 @@ var showQr = false; var litecoinUseLtub = true; + var entropyTypeAutoDetect = true; var entropyChangeTimeoutEvent = null; var phraseChangeTimeoutEvent = null; + var seedChangedTimeoutEvent = null; var rootKeyChangedTimeoutEvent = null; var generationProcesses = []; @@ -32,6 +34,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 +47,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,10 +131,12 @@ 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); DOM.more.on("click", showMore); + DOM.seed.on("input", delayedSeedChanged); DOM.rootKey.on("input", delayedRootKeyChanged); DOM.litecoinUseLtub.on("change", litecoinUseLtubChanged); DOM.bip32path.on("input", calcForDerivationPath); @@ -240,6 +245,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 +267,7 @@ calcForDerivationPath(); // Show the word indexes showWordIndexes(); + writeSplitPhrase(phrase); } function tabChanged() { @@ -306,7 +314,7 @@ clearDisplay(); clearEntropyFeedback(); DOM.phrase.val(""); - DOM.phraseSplit.val(""); + DOM.phraseSplit.val(""); showValidationError("Blank entropy"); return; } @@ -329,6 +337,35 @@ } } + function entropyTypeChanged() { + entropyTypeAutoDetect = false; + entropyChanged(); + } + + function delayedSeedChanged() { + // Warn if there is an existing mnemonic or passphrase. + if (DOM.phrase.val().length > 0 || DOM.passphrase.val().length > 0) { + if (!confirm("This will clear existing mnemonic and passphrase")) { + DOM.seed.val(seed); + return + } + } + hideValidationError(); + showPending(); + // Clear existing mnemonic and passphrase + DOM.phrase.val(""); + DOM.phraseSplit.val(""); + DOM.passphrase.val(""); + DOM.rootKey.val(""); + clearAddressesList(); + clearDerivedKeys(); + seed = null; + if (seedChangedTimeoutEvent != null) { + clearTimeout(seedChangedTimeoutEvent); + } + seedChangedTimeoutEvent = setTimeout(seedChanged, 400); + } + function delayedRootKeyChanged() { // Warn if there is an existing mnemonic or passphrase. if (DOM.phrase.val().length > 0 || DOM.passphrase.val().length > 0) { @@ -341,7 +378,7 @@ showPending(); // Clear existing mnemonic and passphrase DOM.phrase.val(""); - DOM.phraseSplit.val(""); + DOM.phraseSplit.val(""); DOM.passphrase.val(""); seed = null; if (rootKeyChangedTimeoutEvent != null) { @@ -350,6 +387,22 @@ rootKeyChangedTimeoutEvent = setTimeout(rootKeyChanged, 400); } + function seedChanged() { + showPending(); + hideValidationError(); + seed = DOM.seed.val(); + bip32RootKey = libs.bitcoin.HDNode.fromSeedHex(seed, network); + var rootKeyBase58 = bip32RootKey.toBase58(); + DOM.rootKey.val(rootKeyBase58); + var errorText = validateRootKey(rootKeyBase58); + if (errorText) { + showValidationError(errorText); + return; + } + // Calculate and display + calcForDerivationPath(); + } + function rootKeyChanged() { showPending(); hideValidationError(); @@ -367,10 +420,10 @@ function litecoinUseLtubChanged() { litecoinUseLtub = DOM.litecoinUseLtub.prop("checked"); if (litecoinUseLtub) { - network = bitcoinjs.bitcoin.networks.litecoin; + network = libs.bitcoin.networks.litecoin; } else { - network = bitcoinjs.bitcoin.networks.litecoinXprv; + network = libs.bitcoin.networks.litecoinXprv; } phraseChanged(); } @@ -428,7 +481,6 @@ if (DOM.phrase.val().length > 0) { var newPhrase = convertPhraseToNewLanguage(); DOM.phrase.val(newPhrase); - writeSplitPhrase(newPhrase); phraseChanged(); } else { @@ -489,7 +541,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); @@ -500,9 +551,9 @@ function calcBip32RootKeyFromSeed(phrase, passphrase) { seed = mnemonic.toSeed(phrase, passphrase); - bip32RootKey = bitcoinjs.bitcoin.HDNode.fromSeedHex(seed, network); + bip32RootKey = libs.bitcoin.HDNode.fromSeedHex(seed, network); if(isGRS()) - bip32RootKey = groestlcoinjs.HDNode.fromSeedHex(seed, network); + bip32RootKey = libs.groestlcoinjs.HDNode.fromSeedHex(seed, network); } @@ -516,18 +567,18 @@ if (networkHasSegwit()) { var n = network; if ("baseNetwork" in n) { - n = bitcoinjs.bitcoin.networks[n.baseNetwork]; + n = libs.bitcoin.networks[n.baseNetwork]; } // try parsing using base network params try { - bip32RootKey = bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58, n); + bip32RootKey = libs.bitcoin.HDNode.fromBase58(rootKeyBase58, n); return; } catch (e) {} // try parsing using p2wpkh params if ("p2wpkh" in n) { try { - bip32RootKey = bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58, n.p2wpkh); + bip32RootKey = libs.bitcoin.HDNode.fromBase58(rootKeyBase58, n.p2wpkh); return; } catch (e) {} @@ -535,14 +586,30 @@ // try parsing using p2wpkh-in-p2sh network params if ("p2wpkhInP2sh" in n) { try { - bip32RootKey = bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58, n.p2wpkhInP2sh); + bip32RootKey = libs.bitcoin.HDNode.fromBase58(rootKeyBase58, n.p2wpkhInP2sh); + return; + } + catch (e) {} + } + // try parsing using p2wsh network params + if ("p2wsh" in n) { + try { + bip32RootKey = libs.bitcoin.HDNode.fromBase58(rootKeyBase58, n.p2wsh); + return; + } + catch (e) {} + } + // try parsing using p2wsh-in-p2sh network params + if ("p2wshInP2sh" in n) { + try { + bip32RootKey = libs.bitcoin.HDNode.fromBase58(rootKeyBase58, n.p2wshInP2sh); return; } catch (e) {} } } // try the network params as currently specified - bip32RootKey = bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58, network); + bip32RootKey = libs.bitcoin.HDNode.fromBase58(rootKeyBase58, network); } function calcBip32RootKeyFromBase58GRS(rootKeyBase58) { @@ -551,18 +618,18 @@ if (networkHasSegwit()) { var n = network; if ("baseNetwork" in n) { - n = bitcoinjs.bitcoin.networks[n.baseNetwork]; + n = libs.bitcoin.networks[n.baseNetwork]; } // try parsing using base network params try { - bip32RootKey = groestlcoinjs.HDNode.fromBase58(rootKeyBase58, n); + bip32RootKey = libs.groestlcoinjs.HDNode.fromBase58(rootKeyBase58, n); return; } catch (e) {} // try parsing using p2wpkh params if ("p2wpkh" in n) { try { - bip32RootKey = groestlcoinjs.HDNode.fromBase58(rootKeyBase58, n.p2wpkh); + bip32RootKey = libs.groestlcoinjs.HDNode.fromBase58(rootKeyBase58, n.p2wpkh); return; } catch (e) {} @@ -570,14 +637,14 @@ // try parsing using p2wpkh-in-p2sh network params if ("p2wpkhInP2sh" in n) { try { - bip32RootKey = groestlcoinjs.HDNode.fromBase58(rootKeyBase58, n.p2wpkhInP2sh); + bip32RootKey = libs.groestlcoinjs.HDNode.fromBase58(rootKeyBase58, n.p2wpkhInP2sh); return; } catch (e) {} } } // try the network params as currently specified - bip32RootKey = groestlcoinjs.HDNode.fromBase58(rootKeyBase58, network); + bip32RootKey = libs.groestlcoinjs.HDNode.fromBase58(rootKeyBase58, network); } function calcBip32ExtendedKey(path) { @@ -607,7 +674,7 @@ extendedKey = extendedKey.derive(index); } } - return extendedKey + return extendedKey; } function showValidationError(errorText) { @@ -650,26 +717,26 @@ } function validateRootKey(rootKeyBase58) { - if(isGRS()) + if(isGRS()) return validateRootKeyGRS(rootKeyBase58); - + // try various segwit network params since this extended key may be from // any one of them. if (networkHasSegwit()) { var n = network; if ("baseNetwork" in n) { - n = bitcoinjs.bitcoin.networks[n.baseNetwork]; + n = libs.bitcoin.networks[n.baseNetwork]; } // try parsing using base network params try { - bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58, n); + libs.bitcoin.HDNode.fromBase58(rootKeyBase58, n); return ""; } catch (e) {} // try parsing using p2wpkh params if ("p2wpkh" in n) { try { - bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58, n.p2wpkh); + libs.bitcoin.HDNode.fromBase58(rootKeyBase58, n.p2wpkh); return ""; } catch (e) {} @@ -677,7 +744,23 @@ // try parsing using p2wpkh-in-p2sh network params if ("p2wpkhInP2sh" in n) { try { - bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58, n.p2wpkhInP2sh); + libs.bitcoin.HDNode.fromBase58(rootKeyBase58, n.p2wpkhInP2sh); + return ""; + } + catch (e) {} + } + // try parsing using p2wsh network params + if ("p2wsh" in n) { + try { + libs.bitcoin.HDNode.fromBase58(rootKeyBase58, n.p2wsh); + return ""; + } + catch (e) {} + } + // try parsing using p2wsh-in-p2sh network params + if ("p2wshInP2sh" in n) { + try { + libs.bitcoin.HDNode.fromBase58(rootKeyBase58, n.p2wshInP2sh); return ""; } catch (e) {} @@ -685,7 +768,7 @@ } // try the network params as currently specified try { - bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58, network); + libs.bitcoin.HDNode.fromBase58(rootKeyBase58, network); } catch (e) { return "Invalid root key"; @@ -699,18 +782,18 @@ if (networkHasSegwit()) { var n = network; if ("baseNetwork" in n) { - n = bitcoinjs.bitcoin.networks[n.baseNetwork]; + n = libs.bitcoin.networks[n.baseNetwork]; } // try parsing using base network params try { - groestlcoinjs.HDNode.fromBase58(rootKeyBase58, n); + libs.groestlcoinjs.HDNode.fromBase58(rootKeyBase58, n); return ""; } catch (e) {} // try parsing using p2wpkh params if ("p2wpkh" in n) { try { - groestlcoinjs.HDNode.fromBase58(rootKeyBase58, n.p2wpkh); + libs.groestlcoinjs.HDNode.fromBase58(rootKeyBase58, n.p2wpkh); return ""; } catch (e) {} @@ -718,7 +801,7 @@ // try parsing using p2wpkh-in-p2sh network params if ("p2wpkhInP2sh" in n) { try { - groestlcoinjs.HDNode.fromBase58(rootKeyBase58, n.p2wpkhInP2sh); + libs.groestlcoinjs.HDNode.fromBase58(rootKeyBase58, n.p2wpkhInP2sh); return ""; } catch (e) {} @@ -726,7 +809,7 @@ } // try the network params as currently specified try { - groestlcoinjs.HDNode.fromBase58(rootKeyBase58, network); + libs.groestlcoinjs.HDNode.fromBase58(rootKeyBase58, network); } catch (e) { return "Invalid root key"; @@ -848,6 +931,10 @@ return networks[DOM.network.val()].name == "GRS - Groestlcoin" || networks[DOM.network.val()].name == "GRS - Groestlcoin Testnet"; } + function isELA() { + return networks[DOM.network.val()].name == "ELA - Elastos" + } + function displayBip44Info() { // Get the derivation path for the account var purpose = parseIntNoNaN(DOM.bip44purpose.val(), 44); @@ -861,9 +948,14 @@ var accountExtendedKey = calcBip32ExtendedKey(path); var accountXprv = accountExtendedKey.toBase58(); var accountXpub = accountExtendedKey.neutered().toBase58(); + // Display the extended keys DOM.bip44accountXprv.val(accountXprv); DOM.bip44accountXpub.val(accountXpub); + + if (isELA()) { + displayBip44InfoForELA(); + } } function displayBip49Info() { @@ -919,6 +1011,10 @@ clearAddressesList(); var initialAddressCount = parseInt(DOM.rowsToAdd.val()); displayAddresses(0, initialAddressCount); + + if (isELA()) { + displayBip32InfoForELA(); + } } function displayAddresses(start, total) { @@ -956,6 +1052,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; @@ -967,6 +1071,8 @@ var segwitAvailable = networkHasSegwit(); var isP2wpkh = p2wpkhSelected(); var isP2wpkhInP2sh = p2wpkhInP2shSelected(); + var isP2wsh = p2wshSelected(); + var isP2wshInP2sh = p2wshInP2shSelected(); function init() { calculateValues(); @@ -990,9 +1096,9 @@ var keyPair = key.keyPair; var useUncompressed = useBip38; if (useUncompressed) { - keyPair = new bitcoinjs.bitcoin.ECPair(keyPair.d, null, { network: network, compressed: false }); + keyPair = new libs.bitcoin.ECPair(keyPair.d, null, { network: network, compressed: false }); if(isGRS()) - keyPair = new groestlcoinjs.ECPair(keyPair.d, null, { network: network, compressed: false }); + keyPair = new libs.groestlcoinjs.ECPair(keyPair.d, null, { network: network, compressed: false }); } // get address @@ -1004,12 +1110,12 @@ privkey = keyPair.toWIF(); // BIP38 encode private key if required if (useBip38) { - if(isGRS()) - privkey = groestlcoinjsBip38.encrypt(keyPair.d.toBuffer(), false, bip38password, function(p) { + if(isGRS()) + privkey = libs.groestlcoinjsBip38.encrypt(keyPair.d.toBuffer(), false, bip38password, function(p) { console.log("Progressed " + p.percent.toFixed(1) + "% for index " + index); }, null, networks[DOM.network.val()].name.includes("Testnet")); else - privkey = bitcoinjsBip38.encrypt(keyPair.d.toBuffer(), false, bip38password, function(p) { + privkey = libs.bip38.encrypt(keyPair.d.toBuffer(), false, bip38password, function(p) { console.log("Progressed " + p.percent.toFixed(1) + "% for index " + index); }); } @@ -1021,28 +1127,15 @@ 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") - ) { - var privKeyBuffer = keyPair.d.toBuffer(32); - privkey = privKeyBuffer.toString('hex'); - var addressBuffer = ethUtil.privateToAddress(privKeyBuffer); + if (networkIsEthereum()) { + var pubkeyBuffer = keyPair.getPublicKeyBuffer(); + var ethPubkey = libs.ethUtil.importPublic(pubkeyBuffer); + var addressBuffer = libs.ethUtil.publicToAddress(ethPubkey); var hexAddress = addressBuffer.toString('hex'); - var checksumAddress = ethUtil.toChecksumAddress(hexAddress); - address = ethUtil.addHexPrefix(checksumAddress); - privkey = ethUtil.addHexPrefix(privkey); - pubkey = ethUtil.addHexPrefix(pubkey); + var checksumAddress = libs.ethUtil.toChecksumAddress(hexAddress); + address = libs.ethUtil.addHexPrefix(checksumAddress); + privkey = libs.ethUtil.addHexPrefix(privkey); + pubkey = libs.ethUtil.addHexPrefix(pubkey); } // Stellar is different @@ -1052,15 +1145,14 @@ var path = "m/"; path += purpose + "'/"; path += coin + "'/" + index + "'"; - var keypair = stellarUtil.getKeypair(path, seed); + var keypair = libs.stellarUtil.getKeypair(path, seed); indexText = path; privkey = keypair.secret(); pubkey = address = keypair.publicKey(); } if ((networks[DOM.network.val()].name == "NAS - Nebulas")) { - var NasAccount = require("nebulas-account"); var privKeyBuffer = keyPair.d.toBuffer(32); - var nebulasAccount = new NasAccount(); + var nebulasAccount = libs.nebulas.Account.NewAccount(); nebulasAccount.setPrivateKey(privKeyBuffer); address = nebulasAccount.getAddressString(); privkey = nebulasAccount.getPrivateKeyString(); @@ -1080,17 +1172,17 @@ if (networks[DOM.network.val()].name == "BCH - Bitcoin Cash") { var bchAddrType = DOM.bitcoinCashAddressType.filter(":checked").val(); if (bchAddrType == "cashaddr") { - address = bchaddr.toCashAddress(address); + address = libs.bchaddr.toCashAddress(address); } else if (bchAddrType == "bitpay") { - address = bchaddr.toBitpayAddress(address); + address = libs.bchaddr.toBitpayAddress(address); } } // Bitcoin Cash address format may vary if (networks[DOM.network.val()].name == "SLP - Simple Ledger Protocol") { var bchAddrType = DOM.bitcoinCashAddressType.filter(":checked").val(); if (bchAddrType == "cashaddr") { - address = bchaddr.toSlpAddress(address); + address = libs.bchaddrSlp.toSlpAddress(address); } } // Segwit addresses are different @@ -1099,21 +1191,36 @@ return; } if (isP2wpkh) { - var keyhash = bitcoinjs.bitcoin.crypto.hash160(key.getPublicKeyBuffer()); - var scriptpubkey = bitcoinjs.bitcoin.script.witnessPubKeyHash.output.encode(keyhash); - address = bitcoinjs.bitcoin.address.fromOutputScript(scriptpubkey, network) + var keyhash = libs.bitcoin.crypto.hash160(key.getPublicKeyBuffer()); + var scriptpubkey = libs.bitcoin.script.witnessPubKeyHash.output.encode(keyhash); + address = libs.bitcoin.address.fromOutputScript(scriptpubkey, network) } else if (isP2wpkhInP2sh) { - var keyhash = bitcoinjs.bitcoin.crypto.hash160(key.getPublicKeyBuffer()); - var scriptsig = bitcoinjs.bitcoin.script.witnessPubKeyHash.output.encode(keyhash); - var addressbytes = bitcoinjs.bitcoin.crypto.hash160(scriptsig); - var scriptpubkey = bitcoinjs.bitcoin.script.scriptHash.output.encode(addressbytes); - address = bitcoinjs.bitcoin.address.fromOutputScript(scriptpubkey, network) + var keyhash = libs.bitcoin.crypto.hash160(key.getPublicKeyBuffer()); + var scriptsig = libs.bitcoin.script.witnessPubKeyHash.output.encode(keyhash); + var addressbytes = libs.bitcoin.crypto.hash160(scriptsig); + var scriptpubkey = libs.bitcoin.script.scriptHash.output.encode(addressbytes); + address = libs.bitcoin.address.fromOutputScript(scriptpubkey, network) + } + else if (isP2wsh) { + // https://github.com/libs.bitcoinjs-lib/blob/v3.3.2/test/integration/addresses.js#L71 + // This is a 1-of-1 + var witnessScript = libs.bitcoin.script.multisig.output.encode(1, [key.getPublicKeyBuffer()]); + var scriptPubKey = libs.bitcoin.script.witnessScriptHash.output.encode(libs.bitcoin.crypto.sha256(witnessScript)); + address = libs.bitcoin.address.fromOutputScript(scriptPubKey, network); + } + else if (isP2wshInP2sh) { + // https://github.com/libs.bitcoinjs-lib/blob/v3.3.2/test/integration/transactions.js#L183 + // This is a 1-of-1 + var witnessScript = libs.bitcoin.script.multisig.output.encode(1, [key.getPublicKeyBuffer()]); + var redeemScript = libs.bitcoin.script.witnessScriptHash.output.encode(libs.bitcoin.crypto.sha256(witnessScript)); + var scriptPubKey = libs.bitcoin.script.scriptHash.output.encode(libs.bitcoin.crypto.hash160(redeemScript)); + address = libs.bitcoin.address.fromOutputScript(scriptPubKey, network) } } if ((networks[DOM.network.val()].name == "CRW - Crown")) { - address = bitcoinjs.bitcoin.networks.crown.toNewAddress(address); + address = libs.bitcoin.networks.crown.toNewAddress(address); } if (networks[DOM.network.val()].name == "EOS - EOSIO") { @@ -1130,15 +1237,28 @@ return; } if (isP2wpkh) { - address = groestlcoinjs.address.fromOutputScript(scriptpubkey, network) + address = libs.groestlcoinjs.address.fromOutputScript(scriptpubkey, network) } else if (isP2wpkhInP2sh) { - address = groestlcoinjs.address.fromOutputScript(scriptpubkey, network) + address = libs.groestlcoinjs.address.fromOutputScript(scriptpubkey, network) } - } + } //non-segwit addresses are handled by using groestlcoinjs for bip32RootKey } + if (isELA()) { + let elaAddress = calcAddressForELA( + seed, + parseIntNoNaN(DOM.bip44coin.val(), 0), + parseIntNoNaN(DOM.bip44account.val(), 0), + parseIntNoNaN(DOM.bip44change.val(), 0), + index + ); + address = elaAddress.address; + privkey = elaAddress.privateKey; + pubkey = elaAddress.publicKey; + } + addAddressToList(indexText, address, pubkey, privkey); if (isLast) { hidePending(); @@ -1274,7 +1394,7 @@ if (comparedTo.indexOf(word) == 0) { return comparedTo; } - var distance = Levenshtein.get(word, comparedTo); + var distance = libs.levenshtein.get(word, comparedTo); if (distance < minDistance) { closestWord = comparedTo; minDistance = distance; @@ -1429,40 +1549,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;i0) { //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;ii0) { + 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