X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=bip39-standalone.html;h=367d9a2fdc1d923728b3cf88e45a1c2f18a0f0c6;hb=ba3cb9ecae2667e98af71f5b38a862ba604e8e1c;hp=1d0e1cf747e47a20b2cc9d8d5e5105bf01c45a07;hpb=e00964ccf7a556895784ed05f0fdec954f5558d5;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git
diff --git a/bip39-standalone.html b/bip39-standalone.html
index 1d0e1cf..367d9a2 100644
--- a/bip39-standalone.html
+++ b/bip39-standalone.html
@@ -96,8 +96,15 @@
.qr-image {
margin: 5px;
}
- .qr-hint {
+ .qr-hint,
+ .qr-warning {
padding: 2px;
+ max-width: 150px;
+ }
+ .more-info {
+ cursor: help;
+ border-bottom: 1px dashed #000;
+ text-decoration: none;
}
@@ -169,7 +176,7 @@
@@ -14693,7 +14718,8 @@ sjcl.hash.sha256.prototype = {
//
//
Test
//
keep em tag
-//
+//
+//
//
// Obtain all the phrases to be translated via js debug console:
//
@@ -14708,7 +14734,8 @@ sjcl.hash.sha256.prototype = {
// Translate.loadForeignPhrases("es", {
// "Test": "Test in Spanish",
// "
keep em tag": "
keep em tag in Spanish",
-// "Example text": "Example text in Spanish"
+// "Example placeholder": "Example placeholder in Spanish"
+// "Example title": "Example title in Spanish"
// });
//
// In your UI put a listener for clicking on the Spanish button:
@@ -14759,10 +14786,21 @@ Translate = new (function() {
},
}
+ var title = {
+ selector: "[data-translate-title]",
+ getKey: function() {
+ return this.getAttribute("title").trim().replace(/\s+/g, " ");
+ },
+ setPhrase: function(p) {
+ this.setAttribute("title", p);
+ },
+ }
+
// Get elements to be translated
var allEls = getEls(text)
.concat(getEls(html))
- .concat(getEls(placeholder));
+ .concat(getEls(placeholder))
+ .concat(getEls(title));
// Provides access to phrases from a non-default language.
// See phrases_en.js for example usage.
@@ -18615,7 +18653,7 @@ window.Entropy = new (function() {
var showAddress = true;
var showPubKey = true;
var showPrivKey = true;
- var showQr = true;
+ var showQr = false;
var entropyChangeTimeoutEvent = null;
var phraseChangeTimeoutEvent = null;
@@ -18653,6 +18691,8 @@ window.Entropy = new (function() {
DOM.bip44purpose = $("#bip44 .purpose");
DOM.bip44coin = $("#bip44 .coin");
DOM.bip44account = $("#bip44 .account");
+ DOM.bip44accountXprv = $("#bip44 .account-xprv");
+ DOM.bip44accountXpub = $("#bip44 .account-xpub");
DOM.bip44change = $("#bip44 .change");
DOM.generatedStrength = $(".generate-container .strength");
DOM.hardenedAddresses = $(".hardened-addresses");
@@ -18667,6 +18707,7 @@ window.Entropy = new (function() {
DOM.privateKeyToggle = $(".private-key-toggle");
DOM.languages = $(".languages a");
DOM.qrContainer = $(".qr-container");
+ DOM.qrHider = DOM.qrContainer.find(".qr-hider");
DOM.qrImage = DOM.qrContainer.find(".qr-image");
DOM.qrHint = DOM.qrContainer.find(".qr-hint");
DOM.showQrEls = $("[data-show-qr]");
@@ -18827,11 +18868,11 @@ window.Entropy = new (function() {
// Calculate and display
calcBip32RootKeyFromBase58(rootKeyBase58);
calcForDerivationPath();
- hidePending();
}
function calcForDerivationPath() {
showPending();
+ clearAddressesList();
hideValidationError();
// Get the derivation path
var derivationPath = getDerivationPath();
@@ -18840,7 +18881,10 @@ window.Entropy = new (function() {
showValidationError(errorText);
return;
}
- calcBip32ExtendedKey(derivationPath);
+ bip32ExtendedKey = calcBip32ExtendedKey(derivationPath);
+ if (bip44TabSelected()) {
+ displayBip44Info();
+ }
displayBip32Info();
hidePending();
}
@@ -18920,7 +18964,7 @@ window.Entropy = new (function() {
}
function calcBip32ExtendedKey(path) {
- bip32ExtendedKey = bip32RootKey;
+ var extendedKey = bip32RootKey;
// Derive the key from the path
var pathBits = path.split("/");
for (var i=0; i
-1;
+ var isXpubkey = !("privKey" in bip32RootKey);
+ if (hardened && isXpubkey) {
+ return "Hardened derivation path is invalid with xpub key";
+ }
return false;
}
+ function displayBip44Info() {
+ // Get the derivation path for the account
+ var purpose = parseIntNoNaN(DOM.bip44purpose.val(), 44);
+ var coin = parseIntNoNaN(DOM.bip44coin.val(), 0);
+ var account = parseIntNoNaN(DOM.bip44account.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.toBase58(false);
+ // Display the extended keys
+ DOM.bip44accountXprv.val(accountXprv);
+ DOM.bip44accountXpub.val(accountXpub);
+ }
+
function displayBip32Info() {
// Display the key
DOM.seed.val(seed);
var rootKey = bip32RootKey.toBase58();
DOM.rootKey.val(rootKey);
- var extendedPrivKey = bip32ExtendedKey.toBase58();
+ var xprvkeyB58 = "NA";
+ if (bip32ExtendedKey.privKey) {
+ xprvkeyB58 = bip32ExtendedKey.toBase58();
+ }
+ var extendedPrivKey = xprvkeyB58;
DOM.extendedPrivKey.val(extendedPrivKey);
var extendedPubKey = bip32ExtendedKey.toBase58(false);
DOM.extendedPubKey.val(extendedPubKey);
@@ -19090,7 +19168,10 @@ window.Entropy = new (function() {
key = bip32ExtendedKey.derive(index);
}
var address = key.getAddress().toString();
- var privkey = key.privKey.toWIF(network);
+ var privkey = "NA";
+ if (key.privKey) {
+ privkey = key.privKey.toWIF(network);
+ }
var pubkey = key.pubKey.toHex();
var indexText = getDerivationPath() + "/" + index;
if (useHardenedAddresses) {
@@ -19524,7 +19605,10 @@ window.Entropy = new (function() {
var size = 130;
DOM.qrImage.qrcode({width: size, height: size, text: content});
if (!showQr) {
- DOM.qrImage.addClass("hidden");
+ DOM.qrHider.addClass("hidden");
+ }
+ else {
+ DOM.qrHider.removeClass("hidden");
}
DOM.qrContainer.removeClass("hidden");
}
@@ -19537,10 +19621,18 @@ window.Entropy = new (function() {
function toggleQr() {
showQr = !showQr;
- DOM.qrImage.toggleClass("hidden");
+ DOM.qrHider.toggleClass("hidden");
DOM.qrHint.toggleClass("hidden");
}
+ function bip44TabSelected() {
+ return DOM.bip44tab.hasClass("active");
+ }
+
+ function bip32TabSelected() {
+ return DOM.bip32tab.hasClass("active");
+ }
+
var networks = [
{
name: "Bitcoin",