var DOM = {};
DOM.phrase = $(".phrase");
+ DOM.passphrase = $(".passphrase");
DOM.generate = $(".generate");
DOM.rootKey = $(".root-key");
DOM.extendedPrivKey = $(".extended-priv-key");
function init() {
// Events
- DOM.phrase.on("keyup", delayedPhraseChanged);
+ DOM.phrase.on("input", delayedPhraseChanged);
+ DOM.passphrase.on("input", delayedPhraseChanged);
DOM.generate.on("click", generateClicked);
DOM.more.on("click", showMore);
- DOM.bip32path.on("keyup", bip32Changed);
- DOM.bip44purpose.on("keyup", bip44Changed);
- DOM.bip44coin.on("keyup", bip44Changed);
- DOM.bip44account.on("keyup", bip44Changed);
- DOM.bip44change.on("keyup", bip44Changed);
+ DOM.bip32path.on("input", bip32Changed);
+ DOM.bip44purpose.on("input", bip44Changed);
+ DOM.bip44coin.on("input", bip44Changed);
+ DOM.bip44account.on("input", bip44Changed);
+ DOM.bip44change.on("input", bip44Changed);
DOM.tab.on("click", tabClicked);
DOM.indexToggle.on("click", toggleIndexes);
DOM.addressToggle.on("click", toggleAddresses);
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
- calcBip32Seed(phrase, derivationPath);
+ calcBip32Seed(phrase, passphrase, derivationPath);
displayBip32Info();
hidePending();
}
return words;
}
- function calcBip32Seed(phrase, path) {
- var seed = mnemonic.toSeed(phrase);
- var seedHash = Bitcoin.crypto.sha256(seed).toString("hex");
- bip32RootKey = Bitcoin.HDNode.fromSeedHex(seedHash, network);
+ function calcBip32Seed(phrase, passphrase, path) {
+ var seed = mnemonic.toSeed(phrase, passphrase);
+ bip32RootKey = Bitcoin.HDNode.fromSeedHex(seed, network);
bip32ExtendedKey = bip32RootKey;
// Derive the key from the path
var pathBits = path.split("/");
function findPhraseErrors(phrase) {
// TODO make this right
// Preprocess the words
+ phrase = mnemonic.normalizeString(phrase);
var parts = phrase.split(" ");
var proper = [];
for (var i=0; i<parts.length; i++) {
var index = i+ start;
var key = bip32ExtendedKey.derive(index);
var address = key.getAddress().toString();
- var privkey = key.privKey.toWIF();
+ var privkey = key.privKey.toWIF(network);
addAddressToList(index, address, privkey);
}
}