X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2Fjs%2Findex.js;h=b88e9d730704aa85114af5736b0c287771cb7a88;hb=0fd67b5915a08168d31caaa581f55cf86591be73;hp=b2fb17ecf254df328d119ffc361b37ea2191006c;hpb=93c3ef47579733040dbc6eec865b528d1ca49911;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git diff --git a/src/js/index.js b/src/js/index.js index b2fb17e..b88e9d7 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -14,7 +14,7 @@ var showPubKey = true; var showPrivKey = true; var showQr = false; - var litecoinUseLtub = false; + var litecoinUseLtub = true; var entropyChangeTimeoutEvent = null; var phraseChangeTimeoutEvent = null; @@ -74,12 +74,12 @@ DOM.bip49change = $("#bip49 .change"); DOM.generatedStrength = $(".generate-container .strength"); DOM.hardenedAddresses = $(".hardened-addresses"); - DOM.useP2wpkhNestedInP2sh = $(".p2wpkh-nested-in-p2sh"); DOM.useBitpayAddressesContainer = $(".use-bitpay-addresses-container"); DOM.useBitpayAddresses = $(".use-bitpay-addresses"); DOM.addresses = $(".addresses"); DOM.rowsToAdd = $(".rows-to-add"); DOM.more = $(".more"); + DOM.moreRowsStartIndex = $(".more-rows-start-index"); DOM.feedback = $(".feedback"); DOM.tab = $(".derivation-type a"); DOM.indexToggle = $(".index-toggle"); @@ -113,7 +113,6 @@ DOM.bip49change.on("input", calcForDerivationPath); DOM.tab.on("shown.bs.tab", tabChanged); DOM.hardenedAddresses.on("change", calcForDerivationPath); - DOM.useP2wpkhNestedInP2sh.on("change", calcForDerivationPath); DOM.indexToggle.on("click", toggleIndexes); DOM.addressToggle.on("click", toggleAddresses); DOM.publicKeyToggle.on("click", togglePublicKeys); @@ -138,11 +137,11 @@ var networkIndex = e.target.value; var network = networks[networkIndex]; network.onSelect(); - if (network.p2wpkhNestedInP2shAvailable) { - showP2wpkhNestedInP2shAvailable(); + if (network.segwitAvailable) { + showSegwitAvailable(); } else { - showP2wpkhNestedInP2shUnavailable(); + showSegwitUnavailable(); } if (seed != null) { phraseChanged(); @@ -216,7 +215,7 @@ function tabChanged() { showPending(); - adjustNetworkForBip49(); + adjustNetworkForSegwit(); var phrase = DOM.phrase.val(); if (phrase != "") { // Calculate and display for mnemonic @@ -317,10 +316,10 @@ function litecoinUseLtubChanged() { litecoinUseLtub = DOM.litecoinUseLtub.prop("checked"); if (litecoinUseLtub) { - network = bitcoinjs.bitcoin.networks.litecoinLtub; + network = bitcoinjs.bitcoin.networks.litecoin; } else { - network = bitcoinjs.bitcoin.networks.litecoin; + network = bitcoinjs.bitcoin.networks.litecoinXprv; } phraseChanged(); } @@ -329,8 +328,8 @@ clearDerivedKeys(); clearAddressesList(); showPending(); - // Don't show bip49 if it's selected but network doesn't support it - if (bip49TabSelected() && !networkHasBip49()) { + // Don't show segwit if it's selected but network doesn't support it + if (segwitSelected() && !networkHasSegwit()) { return; } // Get the derivation path @@ -673,8 +672,8 @@ })()); } - function P2wpkhNestedInP2shSelected() { - return bip49TabSelected() || (bip32TabSelected() && useP2wpkhNestedInP2sh()); + function segwitSelected() { + return bip49TabSelected(); } function TableRow(index, isLast) { @@ -682,8 +681,8 @@ var self = this; this.shouldGenerate = true; var useHardenedAddresses = DOM.hardenedAddresses.prop("checked"); - var isP2wpkhNestedInP2sh = P2wpkhNestedInP2shSelected(); - var p2wpkhNestedInP2shAvailable = networkHasBip49(); + var isSegwit = segwitSelected(); + var segwitAvailable = networkHasSegwit(); function init() { calculateValues(); @@ -727,9 +726,9 @@ privkey = convertRipplePriv(privkey); address = convertRippleAdrr(address); } - // BIP49 addresses are different - if (isP2wpkhNestedInP2sh) { - if (!p2wpkhNestedInP2shAvailable) { + // Segwit addresses are different + if (isSegwit) { + if (!segwitAvailable) { return; } var keyhash = bitcoinjs.bitcoin.crypto.hash160(key.getPublicKeyBuffer()); @@ -750,12 +749,19 @@ } function showMore() { - var start = DOM.addresses.children().length; var rowsToAdd = parseInt(DOM.rowsToAdd.val()); if (isNaN(rowsToAdd)) { rowsToAdd = 20; DOM.rowsToAdd.val("20"); } + var start = parseInt(DOM.moreRowsStartIndex.val()) + if (isNaN(start)) { + start = lastIndexInTable() + 1; + } + else { + var newStart = start + rowsToAdd; + DOM.moreRowsStartIndex.val(newStart); + } if (rowsToAdd > 200) { var msg = "Generating " + rowsToAdd + " rows could take a while. "; msg += "Do you want to continue?"; @@ -1219,12 +1225,8 @@ return DOM.bip32tab.hasClass("active"); } - function useP2wpkhNestedInP2sh() { - return DOM.useP2wpkhNestedInP2sh.prop("checked"); - } - - function networkHasBip49() { - return networks[DOM.network.val()].p2wpkhNestedInP2shAvailable; + function networkHasSegwit() { + return networks[DOM.network.val()].segwitAvailable; } function bip49TabSelected() { @@ -1236,17 +1238,14 @@ DOM.bip49coin.val(coinValue); } - function showP2wpkhNestedInP2shAvailable() { + function showSegwitAvailable() { DOM.bip49unavailable.addClass("hidden"); DOM.bip49available.removeClass("hidden"); - DOM.useP2wpkhNestedInP2sh.prop("disabled", false); } - function showP2wpkhNestedInP2shUnavailable() { + function showSegwitUnavailable() { DOM.bip49available.addClass("hidden"); DOM.bip49unavailable.removeClass("hidden"); - DOM.useP2wpkhNestedInP2sh.prop("disabled", true); - DOM.useP2wpkhNestedInP2sh.prop("checked", false); } function useBitpayAddresses() { @@ -1262,12 +1261,12 @@ } } - function adjustNetworkForBip49() { - // If bip49 is selected the xpub/xprv prefixes need to be adjusted + function adjustNetworkForSegwit() { + // If segwit is selected the xpub/xprv prefixes need to be adjusted // to avoid accidentally importing BIP49 xpub to BIP44 watch only // wallet. // See https://github.com/iancoleman/bip39/issues/125 - if (P2wpkhNestedInP2shSelected()) { + if (segwitSelected()) { if (network == bitcoinjs.bitcoin.networks.bitcoin) { network = bitcoinjs.bitcoin.networks.bitcoinBip49; } @@ -1291,10 +1290,18 @@ } } + function lastIndexInTable() { + var pathText = DOM.addresses.find(".index").last().text(); + var pathBits = pathText.split("/"); + var lastBit = pathBits[pathBits.length-1]; + var lastBitClean = lastBit.replace("'", ""); + return parseInt(lastBitClean); + } + var networks = [ { name: "BCH - Bitcoin Cash", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { DOM.useBitpayAddressesContainer.removeClass("hidden"); setBitcoinCashNetworkValues(); @@ -1303,7 +1310,7 @@ }, { name: "BTC - Bitcoin", - p2wpkhNestedInP2shAvailable: true, + segwitAvailable: true, onSelect: function() { network = bitcoinjs.bitcoin.networks.bitcoin; setHdCoin(0); @@ -1311,15 +1318,23 @@ }, { name: "BTC - Bitcoin Testnet", - p2wpkhNestedInP2shAvailable: true, + segwitAvailable: true, onSelect: function() { network = bitcoinjs.bitcoin.networks.testnet; setHdCoin(1); }, }, + { + name: "BTG - Bitcoin Gold", + segwitAvailable: true, + onSelect: function() { + network = bitcoinjs.bitcoin.networks.bgold; + setHdCoin(0); + }, + }, { name: "CLAM - Clams", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.clam; setHdCoin(23); @@ -1327,7 +1342,7 @@ }, { name: "CRW - Crown", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.crown; setHdCoin(72); @@ -1335,7 +1350,7 @@ }, { name: "DASH - Dash", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.dash; setHdCoin(5); @@ -1343,7 +1358,7 @@ }, { name: "DASH - Dash Testnet", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.dashtn; setHdCoin(1); @@ -1351,7 +1366,7 @@ }, { name: "DOGE - Dogecoin", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.dogecoin; setHdCoin(3); @@ -1359,7 +1374,7 @@ }, { name: "ETH - Ethereum", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.bitcoin; setHdCoin(60); @@ -1367,7 +1382,7 @@ }, { name: "FJC - Fujicoin", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.fujicoin; setHdCoin(75); @@ -1375,7 +1390,7 @@ }, { name: "GAME - GameCredits", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.game; setHdCoin(101); @@ -1383,7 +1398,7 @@ }, { name: "JBS - Jumbucks", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.jumbucks; setHdCoin(26); @@ -1391,7 +1406,7 @@ }, { name: "LTC - Litecoin", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: true, onSelect: function() { network = bitcoinjs.bitcoin.networks.litecoin; setHdCoin(2); @@ -1400,16 +1415,23 @@ }, { name: "MAZA - Maza", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.maza; setHdCoin(13); }, }, - + { + name: "MONA - Monacoin", + segwitAvailable: true, + onSelect: function() { + network = bitcoinjs.bitcoin.networks.monacoin, + setHdCoin(22); + }, + }, { name: "NMC - Namecoin", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.namecoin; setHdCoin(7); @@ -1417,7 +1439,7 @@ }, { name: "PIVX - PIVX", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.pivx; setHdCoin(119); @@ -1425,7 +1447,7 @@ }, { name: "PIVX - PIVX Testnet", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.pivxtestnet; setHdCoin(1); @@ -1433,7 +1455,7 @@ }, { name: "PPC - Peercoin", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.peercoin; setHdCoin(6); @@ -1441,7 +1463,7 @@ }, { name: "SDC - ShadowCash", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.shadow; setHdCoin(35); @@ -1449,7 +1471,7 @@ }, { name: "SDC - ShadowCash Testnet", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.shadowtn; setHdCoin(1); @@ -1457,7 +1479,7 @@ }, { name: "SLM - Slimcoin", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.slimcoin; setHdCoin(63); @@ -1465,7 +1487,7 @@ }, { name: "SLM - Slimcoin Testnet", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.slimcointn; setHdCoin(111); @@ -1473,7 +1495,7 @@ }, { name: "USNBT - NuBits", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.nubits; setHdCoin(12); @@ -1481,7 +1503,7 @@ }, { name: "VIA - Viacoin", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.viacoin; setHdCoin(14); @@ -1489,7 +1511,7 @@ }, { name: "VIA - Viacoin Testnet", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.viacointestnet; setHdCoin(1); @@ -1497,7 +1519,7 @@ }, { name: "XMY - Myriadcoin", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.myriadcoin; setHdCoin(90); @@ -1505,7 +1527,7 @@ }, { name: "XRP - Ripple", - p2wpkhNestedInP2shAvailable: false, + segwitAvailable: false, onSelect: function() { network = bitcoinjs.bitcoin.networks.bitcoin; setHdCoin(144);