var showPrivKey = true;
var showQr = false;
var litecoinUseLtub = true;
- var isDefaultBip44ChangeValue = true;
var entropyChangeTimeoutEvent = null;
var phraseChangeTimeoutEvent = null;
DOM.bip44accountXprv = $("#bip44 .account-xprv");
DOM.bip44accountXpub = $("#bip44 .account-xpub");
DOM.bip44change = $("#bip44 .change");
- DOM.defaultBip44ChangeValue = $("#bip44 .default-bip44-change-value");
DOM.bip49unavailable = $("#bip49 .unavailable");
DOM.bip49available = $("#bip49 .available");
DOM.bip49path = $("#bip49-path");
DOM.litecoinUseLtub.on("change", litecoinUseLtubChanged);
DOM.bip32path.on("input", calcForDerivationPath);
DOM.bip44account.on("input", calcForDerivationPath);
- DOM.bip44change.on("input", modifiedDefaultBip44ChangeValue);
DOM.bip44change.on("input", calcForDerivationPath);
- DOM.defaultBip44ChangeValue.on("click", resetDefaultBip44ChangeValue);
DOM.bip49account.on("input", calcForDerivationPath);
DOM.bip49change.on("input", calcForDerivationPath);
DOM.bip84account.on("input", calcForDerivationPath);
}
catch (e) {}
}
+ // try parsing using p2wsh network params
+ if ("p2wsh" in n) {
+ try {
+ bip32RootKey = bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58, n.p2wsh);
+ return;
+ }
+ catch (e) {}
+ }
+ // try parsing using p2wsh-in-p2sh network params
+ if ("p2wshInP2sh" in n) {
+ try {
+ bip32RootKey = bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58, n.p2wshInP2sh);
+ return;
+ }
+ catch (e) {}
+ }
}
// try the network params as currently specified
bip32RootKey = bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58, network);
}
catch (e) {}
}
+ // try parsing using p2wsh network params
+ if ("p2wsh" in n) {
+ try {
+ bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58, n.p2wsh);
+ return "";
+ }
+ catch (e) {}
+ }
+ // try parsing using p2wsh-in-p2sh network params
+ if ("p2wshInP2sh" in n) {
+ try {
+ bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58, n.p2wshInP2sh);
+ return "";
+ }
+ catch (e) {}
+ }
}
// try the network params as currently specified
try {
var purpose = parseIntNoNaN(DOM.bip44purpose.val(), 44);
var coin = parseIntNoNaN(DOM.bip44coin.val(), 0);
var account = parseIntNoNaN(DOM.bip44account.val(), 0);
- var change = parseIntNoNaN(DOM.bip44change.val(), "");
- var path = "m";
- path += "/" + purpose + "'";
- path += "/" + coin + "'";
- path += "/" + account + "'";
- if (change !== "") {
- path += "/" + change;
- }
+ var change = parseIntNoNaN(DOM.bip44change.val(), 0);
+ var path = "m/";
+ path += purpose + "'/";
+ path += coin + "'/";
+ path += account + "'/";
+ path += change;
DOM.bip44path.val(path);
var derivationPath = DOM.bip44path.val();
console.log("Using derivation path from BIP44 tab: " + derivationPath);
(bip141TabSelected() && DOM.bip141semantics.val() == "p2wpkh-p2sh");
}
+ function p2wshSelected() {
+ return bip141TabSelected() && DOM.bip141semantics.val() == "p2wsh";
+ }
+
+ function p2wshInP2shSelected() {
+ return (bip141TabSelected() && DOM.bip141semantics.val() == "p2wsh-p2sh");
+ }
+
function TableRow(index, isLast) {
var self = this;
var segwitAvailable = networkHasSegwit();
var isP2wpkh = p2wpkhSelected();
var isP2wpkhInP2sh = p2wpkhInP2shSelected();
+ var isP2wsh = p2wshSelected();
+ var isP2wshInP2sh = p2wshInP2shSelected();
function init() {
calculateValues();
var scriptpubkey = bitcoinjs.bitcoin.script.scriptHash.output.encode(addressbytes);
address = bitcoinjs.bitcoin.address.fromOutputScript(scriptpubkey, network)
}
+ else if (isP2wsh) {
+ // https://github.com/bitcoinjs/bitcoinjs-lib/blob/v3.3.2/test/integration/addresses.js#L71
+ // This is a 1-of-1
+ var witnessScript = bitcoinjs.bitcoin.script.multisig.output.encode(1, [key.getPublicKeyBuffer()]);
+ var scriptPubKey = bitcoinjs.bitcoin.script.witnessScriptHash.output.encode(bitcoinjs.bitcoin.crypto.sha256(witnessScript));
+ address = bitcoinjs.bitcoin.address.fromOutputScript(scriptPubKey, network);
+ }
+ else if (isP2wshInP2sh) {
+ // https://github.com/bitcoinjs/bitcoinjs-lib/blob/v3.3.2/test/integration/transactions.js#L183
+ // This is a 1-of-1
+ var witnessScript = bitcoinjs.bitcoin.script.multisig.output.encode(1, [key.getPublicKeyBuffer()]);
+ var redeemScript = bitcoinjs.bitcoin.script.witnessScriptHash.output.encode(bitcoinjs.bitcoin.crypto.sha256(witnessScript));
+ var scriptPubKey = bitcoinjs.bitcoin.script.scriptHash.output.encode(bitcoinjs.bitcoin.crypto.hash160(redeemScript));
+ address = bitcoinjs.bitcoin.address.fromOutputScript(scriptPubKey, network)
+ }
}
if ((networks[DOM.network.val()].name == "CRW - Crown")) {
return DOM.bip141tab.hasClass("active");
}
- function setBip44ChangeValue() {
- if (isDefaultBip44ChangeValue) {
- if (networkIsEthereum()) {
- DOM.bip44change.val("");
- } else {
- DOM.bip44change.val(0);
- }
- }
- }
-
- function modifiedDefaultBip44ChangeValue() {
- isDefaultBip44ChangeValue = false;
- }
-
- function resetDefaultBip44ChangeValue() {
- isDefaultBip44ChangeValue = true;
- setBip44ChangeValue();
- }
-
function setHdCoin(coinValue) {
DOM.bip44coin.val(coinValue);
DOM.bip49coin.val(coinValue);
DOM.bip84coin.val(coinValue);
- setBip44ChangeValue();
}
function showSegwitAvailable() {
else if (p2wpkhInP2shSelected() && "p2wpkhInP2sh" in network) {
network = network.p2wpkhInP2sh;
}
+ else if (p2wshSelected() && "p2wsh" in network) {
+ network = network.p2wsh;
+ }
+ else if (p2wshInP2shSelected() && "p2wshInP2sh" in network) {
+ network = network.p2wshInP2sh;
+ }
}
function lastIndexInTable() {