X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=bip39-standalone.html;h=5f9cf7cca095f2e3020ac255a9d3bea044bce6a2;hb=82f91834f640eb66f9f5ab01f9df37cf805bc13b;hp=b1fe90ef7f658b1349b00e1d4ab43e03059205ef;hpb=563e401a4f3880da88bfc69cf51be5a1becd4c66;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git
diff --git a/bip39-standalone.html b/bip39-standalone.html
index b1fe90e..5f9cf7c 100644
--- a/bip39-standalone.html
+++ b/bip39-standalone.html
@@ -71,14 +71,14 @@
+
+
@@ -14830,6 +14846,7 @@ var Mnemonic = function(language) {
var showPrivKey = true;
var phraseChangeTimeoutEvent = null;
+ var rootKeyChangedTimeoutEvent = null;
var DOM = {};
DOM.network = $(".network");
@@ -14852,6 +14869,7 @@ var Mnemonic = function(language) {
DOM.bip44account = $("#bip44 .account");
DOM.bip44change = $("#bip44 .change");
DOM.strength = $(".strength");
+ DOM.hardenedAddresses = $(".hardened-addresses");
DOM.addresses = $(".addresses");
DOM.rowsToAdd = $(".rows-to-add");
DOM.more = $(".more");
@@ -14868,12 +14886,14 @@ var Mnemonic = function(language) {
DOM.passphrase.on("input", delayedPhraseChanged);
DOM.generate.on("click", generateClicked);
DOM.more.on("click", showMore);
- DOM.bip32path.on("input", delayedPhraseChanged);
- DOM.bip44purpose.on("input", delayedPhraseChanged);
- DOM.bip44coin.on("input", delayedPhraseChanged);
- DOM.bip44account.on("input", delayedPhraseChanged);
- DOM.bip44change.on("input", delayedPhraseChanged);
- DOM.tab.on("click", delayedPhraseChanged);
+ 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);
+ DOM.hardenedAddresses.on("change", calcForDerivationPath);
DOM.indexToggle.on("click", toggleIndexes);
DOM.addressToggle.on("click", toggleAddresses);
DOM.privateKeyToggle.on("click", togglePrivateKeys);
@@ -14886,9 +14906,14 @@ var Mnemonic = function(language) {
// Event handlers
function networkChanged(e) {
- var network = e.target.value;
- networks[network].onSelect();
- delayedPhraseChanged();
+ var networkIndex = e.target.value;
+ networks[networkIndex].onSelect();
+ if (seed != null) {
+ phraseChanged();
+ }
+ else {
+ rootKeyChanged();
+ }
}
function delayedPhraseChanged() {
@@ -14905,12 +14930,57 @@ var Mnemonic = function(language) {
hideValidationError();
// Get the mnemonic phrase
var phrase = DOM.phrase.val();
- var passphrase = DOM.passphrase.val();
var errorText = findPhraseErrors(phrase);
if (errorText) {
showValidationError(errorText);
return;
}
+ // Calculate and display
+ var passphrase = DOM.passphrase.val();
+ calcBip32RootKeyFromSeed(phrase, passphrase);
+ calcForDerivationPath();
+ hidePending();
+ }
+
+ function delayedRootKeyChanged() {
+ // 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.rootKey.val(bip32RootKey);
+ return
+ }
+ }
+ hideValidationError();
+ showPending();
+ // Clear existing mnemonic and passphrase
+ DOM.phrase.val("");
+ DOM.passphrase.val("");
+ seed = null;
+ if (rootKeyChangedTimeoutEvent != null) {
+ clearTimeout(rootKeyChangedTimeoutEvent);
+ }
+ rootKeyChangedTimeoutEvent = setTimeout(rootKeyChanged, 400);
+ }
+
+ function rootKeyChanged() {
+ showPending();
+ hideValidationError();
+ // Validate the root key TODO
+ var rootKeyBase58 = DOM.rootKey.val();
+ var errorText = validateRootKey(rootKeyBase58);
+ if (errorText) {
+ showValidationError(errorText);
+ return;
+ }
+ // Calculate and display
+ calcBip32RootKeyFromBase58(rootKeyBase58);
+ calcForDerivationPath();
+ hidePending();
+ }
+
+ function calcForDerivationPath() {
+ showPending();
+ hideValidationError();
// Get the derivation path
var derivationPath = getDerivationPath();
var errorText = findDerivationPathErrors(derivationPath);
@@ -14918,8 +14988,7 @@ var Mnemonic = function(language) {
showValidationError(errorText);
return;
}
- // Calculate and display
- calcBip32Seed(phrase, passphrase, derivationPath);
+ calcBip32ExtendedKey(derivationPath);
displayBip32Info();
hidePending();
}
@@ -14966,9 +15035,16 @@ var Mnemonic = function(language) {
return words;
}
- function calcBip32Seed(phrase, passphrase, path) {
+ function calcBip32RootKeyFromSeed(phrase, passphrase) {
seed = mnemonic.toSeed(phrase, passphrase);
bip32RootKey = bitcoin.HDNode.fromSeedHex(seed, network);
+ }
+
+ function calcBip32RootKeyFromBase58(rootKeyBase58) {
+ bip32RootKey = bitcoin.HDNode.fromBase58(rootKeyBase58);
+ }
+
+ function calcBip32ExtendedKey(path) {
bip32ExtendedKey = bip32RootKey;
// Derive the key from the path
var pathBits = path.split("/");
@@ -15031,6 +15107,16 @@ var Mnemonic = function(language) {
return false;
}
+ function validateRootKey(rootKeyBase58) {
+ try {
+ bitcoin.HDNode.fromBase58(rootKeyBase58);
+ }
+ catch (e) {
+ return "Invalid root key";
+ }
+ return "";
+ }
+
function getDerivationPath() {
if (DOM.bip44tab.hasClass("active")) {
var purpose = parseIntNoNaN(DOM.bip44purpose.val(), 44);
@@ -15117,16 +15203,27 @@ var Mnemonic = function(language) {
function TableRow(index) {
+ var useHardenedAddresses = DOM.hardenedAddresses.prop("checked");
+
function init() {
calculateValues();
}
function calculateValues() {
setTimeout(function() {
- var key = bip32ExtendedKey.derive(index);
+ var key = "";
+ if (useHardenedAddresses) {
+ key = bip32ExtendedKey.deriveHardened(index);
+ }
+ else {
+ key = bip32ExtendedKey.derive(index);
+ }
var address = key.getAddress().toString();
var privkey = key.privKey.toWIF(network);
var indexText = getDerivationPath() + "/" + index;
+ if (useHardenedAddresses) {
+ indexText = indexText + "'";
+ }
addAddressToList(indexText, address, privkey);
}, 50)
}