X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2Fjs%2Findex.js;h=79f4e4ccb4dbb48e200a403c124b7d5970db20eb;hb=56ad960105f082e958154c24ad49d25c1db2f4be;hp=9b8432a4d64686dfbf45cdaf6f8d2ed275c85bd6;hpb=a0091a40c46d1ece61193ee84c0a1b7de771e447;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git diff --git a/src/js/index.js b/src/js/index.js index 9b8432a..79f4e4c 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -47,8 +47,10 @@ DOM.extendedPubKey = $(".extended-pub-key"); DOM.bip32tab = $("#bip32-tab"); DOM.bip44tab = $("#bip44-tab"); + DOM.bip49tab = $("#bip49-tab"); DOM.bip32panel = $("#bip32"); DOM.bip44panel = $("#bip44"); + DOM.bip49panel = $("#bip49"); DOM.bip32path = $("#bip32-path"); DOM.bip44path = $("#bip44-path"); DOM.bip44purpose = $("#bip44 .purpose"); @@ -57,6 +59,15 @@ DOM.bip44accountXprv = $("#bip44 .account-xprv"); DOM.bip44accountXpub = $("#bip44 .account-xpub"); DOM.bip44change = $("#bip44 .change"); + DOM.bip49unavailable = $("#bip49 .unavailable"); + DOM.bip49available = $("#bip49 .available"); + DOM.bip49path = $("#bip49-path"); + DOM.bip49purpose = $("#bip49 .purpose"); + DOM.bip49coin = $("#bip49 .coin"); + DOM.bip49account = $("#bip49 .account"); + DOM.bip49accountXprv = $("#bip49 .account-xprv"); + DOM.bip49accountXpub = $("#bip49 .account-xpub"); + DOM.bip49change = $("#bip49 .change"); DOM.generatedStrength = $(".generate-container .strength"); DOM.hardenedAddresses = $(".hardened-addresses"); DOM.addresses = $(".addresses"); @@ -88,10 +99,10 @@ DOM.more.on("click", showMore); DOM.rootKey.on("input", delayedRootKeyChanged); DOM.bip32path.on("input", calcForDerivationPath); - DOM.bip44purpose.on("input", calcForDerivationPath); - DOM.bip44coin.on("input", calcForDerivationPath); DOM.bip44account.on("input", calcForDerivationPath); DOM.bip44change.on("input", calcForDerivationPath); + DOM.bip49account.on("input", calcForDerivationPath); + DOM.bip49change.on("input", calcForDerivationPath); DOM.tab.on("shown.bs.tab", calcForDerivationPath); DOM.hardenedAddresses.on("change", calcForDerivationPath); DOM.indexToggle.on("click", toggleIndexes); @@ -110,8 +121,17 @@ // Event handlers function networkChanged(e) { + clearDerivedKeys(); + clearAddressesList(); var networkIndex = e.target.value; - networks[networkIndex].onSelect(); + var network = networks[networkIndex]; + network.onSelect(); + if (network.bip49available) { + showBip49(); + } + else { + hideBip49(); + } if (seed != null) { phraseChanged(); } @@ -254,8 +274,13 @@ function calcForDerivationPath() { showPending(); + clearDerivedKeys(); clearAddressesList(); hideValidationError(); + // Don't show bip49 if it's selected but network doesn't support it + if (bip49TabSelected() && !networkHasBip49()) { + return; + } // Get the derivation path var derivationPath = getDerivationPath(); var errorText = findDerivationPathErrors(derivationPath); @@ -267,6 +292,9 @@ if (bip44TabSelected()) { displayBip44Info(); } + if (bip49TabSelected()) { + displayBip49Info(); + } displayBip32Info(); hidePending(); } @@ -440,6 +468,21 @@ console.log("Using derivation path from BIP44 tab: " + derivationPath); return derivationPath; } + if (bip49TabSelected()) { + var purpose = parseIntNoNaN(DOM.bip49purpose.val(), 49); + var coin = parseIntNoNaN(DOM.bip49coin.val(), 0); + var account = parseIntNoNaN(DOM.bip49account.val(), 0); + var change = parseIntNoNaN(DOM.bip49change.val(), 0); + var path = "m/"; + path += purpose + "'/"; + path += coin + "'/"; + path += account + "'/"; + path += change; + DOM.bip49path.val(path); + var derivationPath = DOM.bip49path.val(); + console.log("Using derivation path from BIP49 tab: " + derivationPath); + return derivationPath; + } else if (bip32TabSelected()) { var derivationPath = DOM.bip32path.val(); console.log("Using derivation path from BIP32 tab: " + derivationPath); @@ -515,6 +558,24 @@ DOM.bip44accountXpub.val(accountXpub); } + function displayBip49Info() { + // Get the derivation path for the account + var purpose = parseIntNoNaN(DOM.bip49purpose.val(), 49); + var coin = parseIntNoNaN(DOM.bip49coin.val(), 0); + var account = parseIntNoNaN(DOM.bip49account.val(), 0); + var path = "m/"; + path += purpose + "'/"; + path += coin + "'/"; + path += account + "'/"; + // Calculate the account extended keys + var accountExtendedKey = calcBip32ExtendedKey(path); + var accountXprv = accountExtendedKey.toBase58(); + var accountXpub = accountExtendedKey.neutered().toBase58(); + // Display the extended keys + DOM.bip49accountXprv.val(accountXprv); + DOM.bip49accountXpub.val(accountXpub); + } + function displayBip32Info() { // Display the key DOM.seed.val(seed); @@ -557,6 +618,8 @@ var self = this; this.shouldGenerate = true; var useHardenedAddresses = DOM.hardenedAddresses.prop("checked"); + var isBip49 = bip49TabSelected(); + var bip49available = networkHasBip49(); function init() { calculateValues(); @@ -600,6 +663,17 @@ privkey = convertRipplePriv(privkey); address = convertRippleAdrr(address); } + // BIP49 addresses are different + if (isBip49) { + if (!bip49available) { + return; + } + 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) + } addAddressToList(indexText, address, pubkey, privkey); }, 50) } @@ -627,7 +701,7 @@ function clearDisplay() { clearAddressesList(); - clearKey(); + clearKeys(); hideValidationError(); } @@ -643,10 +717,20 @@ } } - function clearKey() { + function clearKeys() { + clearRootKey(); + clearDerivedKeys(); + } + + function clearRootKey() { DOM.rootKey.val(""); + } + + function clearDerivedKeys() { DOM.extendedPrivKey.val(""); DOM.extendedPubKey.val(""); + DOM.bip44accountXprv.val(""); + DOM.bip44accountXpub.val(""); } function addAddressToList(indexText, address, pubkey, privkey) { @@ -734,6 +818,9 @@ var option = $("