X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2Fjs%2Findex.js;h=763967ca45bfb73a47eb7942d87bda6890091eda;hb=fa2e4e936eea702d9e3ea56b256bbd886ca26bdf;hp=1e88b701c0f55665fc4727619816ea6dee783247;hpb=534481b628cd6d9172b236c8b6b4ef7fab4e0f29;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git diff --git a/src/js/index.js b/src/js/index.js index 1e88b70..763967c 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 = bitcoin.networks.bitcoin; + var network = bitcoinjs.bitcoin.networks.bitcoin; var addressRowTemplate = $("#address-row-template"); var showIndex = true; @@ -88,8 +88,6 @@ 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.tab.on("shown.bs.tab", calcForDerivationPath); @@ -338,11 +336,11 @@ function calcBip32RootKeyFromSeed(phrase, passphrase) { seed = mnemonic.toSeed(phrase, passphrase); - bip32RootKey = bitcoin.HDNode.fromSeedHex(seed, network); + bip32RootKey = bitcoinjs.bitcoin.HDNode.fromSeedHex(seed, network); } function calcBip32RootKeyFromBase58(rootKeyBase58) { - bip32RootKey = bitcoin.HDNode.fromBase58(rootKeyBase58, network); + bip32RootKey = bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58, network); } function calcBip32ExtendedKey(path) { @@ -360,7 +358,7 @@ continue; } var hardened = bit[bit.length-1] == "'"; - var isPriv = "privKey" in extendedKey; + var isPriv = !(extendedKey.isNeutered()); var invalidDerivationPath = hardened && !isPriv; if (invalidDerivationPath) { extendedKey = null; @@ -416,7 +414,7 @@ function validateRootKey(rootKeyBase58) { try { - bitcoin.HDNode.fromBase58(rootKeyBase58); + bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58); } catch (e) { return "Invalid root key"; @@ -490,7 +488,7 @@ } // Check no hardened derivation path when using xpub keys var hardened = path.indexOf("'") > -1; - var isXpubkey = !("privKey" in bip32RootKey); + var isXpubkey = bip32RootKey.isNeutered(); if (hardened && isXpubkey) { return "Hardened derivation path is invalid with xpub key"; } @@ -509,7 +507,7 @@ // Calculate the account extended keys var accountExtendedKey = calcBip32ExtendedKey(path); var accountXprv = accountExtendedKey.toBase58(); - var accountXpub = accountExtendedKey.toBase58(false); + var accountXpub = accountExtendedKey.neutered().toBase58(); // Display the extended keys DOM.bip44accountXprv.val(accountXprv); DOM.bip44accountXpub.val(accountXpub); @@ -521,12 +519,12 @@ var rootKey = bip32RootKey.toBase58(); DOM.rootKey.val(rootKey); var xprvkeyB58 = "NA"; - if (bip32ExtendedKey.privKey) { + if (!bip32ExtendedKey.isNeutered()) { xprvkeyB58 = bip32ExtendedKey.toBase58(); } var extendedPrivKey = xprvkeyB58; DOM.extendedPrivKey.val(extendedPrivKey); - var extendedPubKey = bip32ExtendedKey.toBase58(false); + var extendedPubKey = bip32ExtendedKey.neutered().toBase58(); DOM.extendedPubKey.val(extendedPubKey); // Display the addresses and privkeys clearAddressesList(); @@ -567,7 +565,7 @@ if (!self.shouldGenerate) { return; } - var key = ""; + var key = "NA"; if (useHardenedAddresses) { key = bip32ExtendedKey.deriveHardened(index); } @@ -576,17 +574,17 @@ } var address = key.getAddress().toString(); var privkey = "NA"; - if (key.privKey) { - privkey = key.privKey.toWIF(network); + if (!key.isNeutered()) { + privkey = key.keyPair.toWIF(network); } - var pubkey = key.pubKey.toHex(); + var pubkey = key.getPublicKeyBuffer().toString('hex'); var indexText = getDerivationPath() + "/" + index; if (useHardenedAddresses) { indexText = indexText + "'"; } // Ethereum values are different if (networks[DOM.network.val()].name == "ETH - Ethereum") { - var privKeyBuffer = key.privKey.d.toBuffer(); + var privKeyBuffer = key.keyPair.d.toBuffer(); privkey = privKeyBuffer.toString('hex'); var addressBuffer = ethUtil.privateToAddress(privKeyBuffer); var hexAddress = addressBuffer.toString('hex'); @@ -627,7 +625,7 @@ function clearDisplay() { clearAddressesList(); - clearKey(); + clearKeys(); hideValidationError(); } @@ -643,10 +641,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) { @@ -1059,21 +1067,21 @@ { name: "BTC - Bitcoin", onSelect: function() { - network = bitcoin.networks.bitcoin; + network = bitcoinjs.bitcoin.networks.bitcoin; DOM.bip44coin.val(0); }, }, { name: "BTC - Bitcoin Testnet", onSelect: function() { - network = bitcoin.networks.testnet; + network = bitcoinjs.bitcoin.networks.testnet; DOM.bip44coin.val(1); }, }, { name: "CLAM - Clams", onSelect: function() { - network = bitcoin.networks.clam; + network = bitcoinjs.bitcoin.networks.clam; DOM.bip44coin.val(23); }, }, @@ -1087,14 +1095,14 @@ { name: "DASH - Dash", onSelect: function() { - network = bitcoin.networks.dash; + network = bitcoinjs.bitcoin.networks.dash; DOM.bip44coin.val(5); }, }, { name: "DASH - Dash Testnet", onSelect: function() { - network = bitcoin.networks.dashtn; + network = bitcoinjs.bitcoin.networks.dashtn; DOM.bip44coin.val(1); }, }, @@ -1108,84 +1116,84 @@ { name: "ETH - Ethereum", onSelect: function() { - network = bitcoin.networks.bitcoin; + network = bitcoinjs.bitcoin.networks.bitcoin; DOM.bip44coin.val(60); }, }, { name: "GAME - GameCredits", onSelect: function() { - network = bitcoin.networks.game; + network = bitcoinjs.bitcoin.networks.game; DOM.bip44coin.val(101); }, }, { name: "JBS - Jumbucks", onSelect: function() { - network = bitcoin.networks.jumbucks; + network = bitcoinjs.bitcoin.networks.jumbucks; DOM.bip44coin.val(26); }, }, { name: "LTC - Litecoin", onSelect: function() { - network = bitcoin.networks.litecoin; + network = bitcoinjs.bitcoin.networks.litecoin; DOM.bip44coin.val(2); }, }, { name: "NMC - Namecoin", onSelect: function() { - network = bitcoin.networks.namecoin; + network = bitcoinjs.bitcoin.networks.namecoin; DOM.bip44coin.val(7); }, }, { name: "PPC - Peercoin", onSelect: function() { - network = bitcoin.networks.peercoin; + network = bitcoinjs.bitcoin.networks.peercoin; DOM.bip44coin.val(6); }, }, { name: "SDC - ShadowCash", onSelect: function() { - network = bitcoin.networks.shadow; + network = bitcoinjs.bitcoin.networks.shadow; DOM.bip44coin.val(35); }, }, { name: "SDC - ShadowCash Testnet", onSelect: function() { - network = bitcoin.networks.shadowtn; + network = bitcoinjs.bitcoin.networks.shadowtn; DOM.bip44coin.val(1); }, }, { name: "SLM - Slimcoin", onSelect: function() { - network = bitcoin.networks.slimcoin; + network = bitcoinjs.bitcoin.networks.slimcoin; DOM.bip44coin.val(63); }, }, { name: "SLM - Slimcoin Testnet", onSelect: function() { - network = bitcoin.networks.slimcointn; + network = bitcoinjs.bitcoin.networks.slimcointn; DOM.bip44coin.val(111); }, }, { name: "VIA - Viacoin", onSelect: function() { - network = bitcoin.networks.viacoin; + network = bitcoinjs.bitcoin.networks.viacoin; DOM.bip44coin.val(14); }, }, { name: "VIA - Viacoin Testnet", onSelect: function() { - network = bitcoin.networks.viacointestnet; + network = bitcoinjs.bitcoin.networks.viacointestnet; DOM.bip44coin.val(1); }, },