nexus/bip39
2
0
Fork 0
mirror of https://github.com/OneKeyHQ/bip39.git synced 2026-04-30 05:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove segwit from bip32 tab

Browse Source 
This option will be added in the future to a bip141 tab
This commit is contained in:
Ian Coleman
2017-11-22 09:59:58 +11:00
parent 1c2b8c6b2d
commit 0fd67b5915
3 changed files with 49 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/index.html
-7
View File
@@ -415,13 +415,6 @@
<span>Use hardened addresses</span> <span>Use hardened addresses</span>
</label> </label>
</div> </div>
<div class="form-group">
<div class="col-sm-2"></div>
<label class="col-sm-10">
<input class="p2wpkh-nested-in-p2sh" type="checkbox">
<span>Use SegWit addresses (ie P2WPKH Nested In P2SH)</span>
</label>
</div>
<div class="form-group"> <div class="form-group">
<label for="core-path" class="col-sm-2 control-label">Bitcoin Core</label> <label for="core-path" class="col-sm-2 control-label">Bitcoin Core</label>
<div class="col-sm-10"> <div class="col-sm-10">
src/js/index.js
+49 -58
View File
@@ -74,7 +74,6 @@
DOM.bip49change = $("#bip49 .change"); DOM.bip49change = $("#bip49 .change");
DOM.generatedStrength = $(".generate-container .strength"); DOM.generatedStrength = $(".generate-container .strength");
DOM.hardenedAddresses = $(".hardened-addresses"); DOM.hardenedAddresses = $(".hardened-addresses");
DOM.useP2wpkhNestedInP2sh = $(".p2wpkh-nested-in-p2sh");
DOM.useBitpayAddressesContainer = $(".use-bitpay-addresses-container"); DOM.useBitpayAddressesContainer = $(".use-bitpay-addresses-container");
DOM.useBitpayAddresses = $(".use-bitpay-addresses"); DOM.useBitpayAddresses = $(".use-bitpay-addresses");
DOM.addresses = $(".addresses"); DOM.addresses = $(".addresses");
@@ -114,7 +113,6 @@
DOM.bip49change.on("input", calcForDerivationPath); DOM.bip49change.on("input", calcForDerivationPath);
DOM.tab.on("shown.bs.tab", tabChanged); DOM.tab.on("shown.bs.tab", tabChanged);
DOM.hardenedAddresses.on("change", calcForDerivationPath); DOM.hardenedAddresses.on("change", calcForDerivationPath);
DOM.useP2wpkhNestedInP2sh.on("change", calcForDerivationPath);
DOM.indexToggle.on("click", toggleIndexes); DOM.indexToggle.on("click", toggleIndexes);
DOM.addressToggle.on("click", toggleAddresses); DOM.addressToggle.on("click", toggleAddresses);
DOM.publicKeyToggle.on("click", togglePublicKeys); DOM.publicKeyToggle.on("click", togglePublicKeys);
@@ -139,11 +137,11 @@
var networkIndex = e.target.value; var networkIndex = e.target.value;
var network = networks[networkIndex]; var network = networks[networkIndex];
network.onSelect(); network.onSelect();
if (network.p2wpkhNestedInP2shAvailable) { if (network.segwitAvailable) {
showP2wpkhNestedInP2shAvailable(); showSegwitAvailable();
} }
else { else {
showP2wpkhNestedInP2shUnavailable(); showSegwitUnavailable();
} }
if (seed != null) { if (seed != null) {
phraseChanged(); phraseChanged();
@@ -217,7 +215,7 @@
function tabChanged() { function tabChanged() {
showPending(); showPending();
adjustNetworkForBip49(); adjustNetworkForSegwit();
var phrase = DOM.phrase.val(); var phrase = DOM.phrase.val();
if (phrase != "") { if (phrase != "") {
// Calculate and display for mnemonic // Calculate and display for mnemonic
@@ -330,8 +328,8 @@
clearDerivedKeys(); clearDerivedKeys();
clearAddressesList(); clearAddressesList();
showPending(); showPending();
// Don't show bip49 if it's selected but network doesn't support it // Don't show segwit if it's selected but network doesn't support it
if (bip49TabSelected() && !networkHasBip49()) { if (segwitSelected() && !networkHasSegwit()) {
return; return;
} }
// Get the derivation path // Get the derivation path
@@ -674,8 +672,8 @@
})()); })());
} }
function P2wpkhNestedInP2shSelected() { function segwitSelected() {
return bip49TabSelected() || (bip32TabSelected() && useP2wpkhNestedInP2sh()); return bip49TabSelected();
} }
function TableRow(index, isLast) { function TableRow(index, isLast) {
@@ -683,8 +681,8 @@
var self = this; var self = this;
this.shouldGenerate = true; this.shouldGenerate = true;
var useHardenedAddresses = DOM.hardenedAddresses.prop("checked"); var useHardenedAddresses = DOM.hardenedAddresses.prop("checked");
var isP2wpkhNestedInP2sh = P2wpkhNestedInP2shSelected(); var isSegwit = segwitSelected();
var p2wpkhNestedInP2shAvailable = networkHasBip49(); var segwitAvailable = networkHasSegwit();
function init() { function init() {
calculateValues(); calculateValues();
@@ -728,9 +726,9 @@
privkey = convertRipplePriv(privkey); privkey = convertRipplePriv(privkey);
address = convertRippleAdrr(address); address = convertRippleAdrr(address);
} }
// BIP49 addresses are different // Segwit addresses are different
if (isP2wpkhNestedInP2sh) { if (isSegwit) {
if (!p2wpkhNestedInP2shAvailable) { if (!segwitAvailable) {
return; return;
} }
var keyhash = bitcoinjs.bitcoin.crypto.hash160(key.getPublicKeyBuffer()); var keyhash = bitcoinjs.bitcoin.crypto.hash160(key.getPublicKeyBuffer());
@@ -1227,12 +1225,8 @@
return DOM.bip32tab.hasClass("active"); return DOM.bip32tab.hasClass("active");
} }
function useP2wpkhNestedInP2sh() { function networkHasSegwit() {
return DOM.useP2wpkhNestedInP2sh.prop("checked"); return networks[DOM.network.val()].segwitAvailable;
}
function networkHasBip49() {
return networks[DOM.network.val()].p2wpkhNestedInP2shAvailable;
} }
function bip49TabSelected() { function bip49TabSelected() {
@@ -1244,17 +1238,14 @@
DOM.bip49coin.val(coinValue); DOM.bip49coin.val(coinValue);
} }
function showP2wpkhNestedInP2shAvailable() { function showSegwitAvailable() {
DOM.bip49unavailable.addClass("hidden"); DOM.bip49unavailable.addClass("hidden");
DOM.bip49available.removeClass("hidden"); DOM.bip49available.removeClass("hidden");
DOM.useP2wpkhNestedInP2sh.prop("disabled", false);
} }
function showP2wpkhNestedInP2shUnavailable() { function showSegwitUnavailable() {
DOM.bip49available.addClass("hidden"); DOM.bip49available.addClass("hidden");
DOM.bip49unavailable.removeClass("hidden"); DOM.bip49unavailable.removeClass("hidden");
DOM.useP2wpkhNestedInP2sh.prop("disabled", true);
DOM.useP2wpkhNestedInP2sh.prop("checked", false);
} }
function useBitpayAddresses() { function useBitpayAddresses() {
@@ -1270,12 +1261,12 @@
} }
} }
function adjustNetworkForBip49() { function adjustNetworkForSegwit() {
// If bip49 is selected the xpub/xprv prefixes need to be adjusted // If segwit is selected the xpub/xprv prefixes need to be adjusted
// to avoid accidentally importing BIP49 xpub to BIP44 watch only // to avoid accidentally importing BIP49 xpub to BIP44 watch only
// wallet. // wallet.
// See https://github.com/iancoleman/bip39/issues/125 // See https://github.com/iancoleman/bip39/issues/125
if (P2wpkhNestedInP2shSelected()) { if (segwitSelected()) {
if (network == bitcoinjs.bitcoin.networks.bitcoin) { if (network == bitcoinjs.bitcoin.networks.bitcoin) {
network = bitcoinjs.bitcoin.networks.bitcoinBip49; network = bitcoinjs.bitcoin.networks.bitcoinBip49;
} }
@@ -1310,7 +1301,7 @@
var networks = [ var networks = [
{ {
name: "BCH - Bitcoin Cash", name: "BCH - Bitcoin Cash",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
DOM.useBitpayAddressesContainer.removeClass("hidden"); DOM.useBitpayAddressesContainer.removeClass("hidden");
setBitcoinCashNetworkValues(); setBitcoinCashNetworkValues();
@@ -1319,7 +1310,7 @@
}, },
{ {
name: "BTC - Bitcoin", name: "BTC - Bitcoin",
p2wpkhNestedInP2shAvailable: true, segwitAvailable: true,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.bitcoin; network = bitcoinjs.bitcoin.networks.bitcoin;
setHdCoin(0); setHdCoin(0);
@@ -1327,7 +1318,7 @@
}, },
{ {
name: "BTC - Bitcoin Testnet", name: "BTC - Bitcoin Testnet",
p2wpkhNestedInP2shAvailable: true, segwitAvailable: true,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.testnet; network = bitcoinjs.bitcoin.networks.testnet;
setHdCoin(1); setHdCoin(1);
@@ -1335,7 +1326,7 @@
}, },
{ {
name: "BTG - Bitcoin Gold", name: "BTG - Bitcoin Gold",
p2wpkhNestedInP2shAvailable: true, segwitAvailable: true,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.bgold; network = bitcoinjs.bitcoin.networks.bgold;
setHdCoin(0); setHdCoin(0);
@@ -1343,7 +1334,7 @@
}, },
{ {
name: "CLAM - Clams", name: "CLAM - Clams",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.clam; network = bitcoinjs.bitcoin.networks.clam;
setHdCoin(23); setHdCoin(23);
@@ -1351,7 +1342,7 @@
}, },
{ {
name: "CRW - Crown", name: "CRW - Crown",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.crown; network = bitcoinjs.bitcoin.networks.crown;
setHdCoin(72); setHdCoin(72);
@@ -1359,7 +1350,7 @@
}, },
{ {
name: "DASH - Dash", name: "DASH - Dash",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.dash; network = bitcoinjs.bitcoin.networks.dash;
setHdCoin(5); setHdCoin(5);
@@ -1367,7 +1358,7 @@
}, },
{ {
name: "DASH - Dash Testnet", name: "DASH - Dash Testnet",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.dashtn; network = bitcoinjs.bitcoin.networks.dashtn;
setHdCoin(1); setHdCoin(1);
@@ -1375,7 +1366,7 @@
}, },
{ {
name: "DOGE - Dogecoin", name: "DOGE - Dogecoin",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.dogecoin; network = bitcoinjs.bitcoin.networks.dogecoin;
setHdCoin(3); setHdCoin(3);
@@ -1383,7 +1374,7 @@
}, },
{ {
name: "ETH - Ethereum", name: "ETH - Ethereum",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.bitcoin; network = bitcoinjs.bitcoin.networks.bitcoin;
setHdCoin(60); setHdCoin(60);
@@ -1391,7 +1382,7 @@
}, },
{ {
name: "FJC - Fujicoin", name: "FJC - Fujicoin",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.fujicoin; network = bitcoinjs.bitcoin.networks.fujicoin;
setHdCoin(75); setHdCoin(75);
@@ -1399,7 +1390,7 @@
}, },
{ {
name: "GAME - GameCredits", name: "GAME - GameCredits",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.game; network = bitcoinjs.bitcoin.networks.game;
setHdCoin(101); setHdCoin(101);
@@ -1407,7 +1398,7 @@
}, },
{ {
name: "JBS - Jumbucks", name: "JBS - Jumbucks",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.jumbucks; network = bitcoinjs.bitcoin.networks.jumbucks;
setHdCoin(26); setHdCoin(26);
@@ -1415,7 +1406,7 @@
}, },
{ {
name: "LTC - Litecoin", name: "LTC - Litecoin",
p2wpkhNestedInP2shAvailable: true, segwitAvailable: true,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.litecoin; network = bitcoinjs.bitcoin.networks.litecoin;
setHdCoin(2); setHdCoin(2);
@@ -1424,7 +1415,7 @@
}, },
{ {
name: "MAZA - Maza", name: "MAZA - Maza",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.maza; network = bitcoinjs.bitcoin.networks.maza;
setHdCoin(13); setHdCoin(13);
@@ -1432,7 +1423,7 @@
}, },
{ {
name: "MONA - Monacoin", name: "MONA - Monacoin",
p2wpkhNestedInP2shAvailable: true, segwitAvailable: true,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.monacoin, network = bitcoinjs.bitcoin.networks.monacoin,
setHdCoin(22); setHdCoin(22);
@@ -1440,7 +1431,7 @@
}, },
{ {
name: "NMC - Namecoin", name: "NMC - Namecoin",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.namecoin; network = bitcoinjs.bitcoin.networks.namecoin;
setHdCoin(7); setHdCoin(7);
@@ -1448,7 +1439,7 @@
}, },
{ {
name: "PIVX - PIVX", name: "PIVX - PIVX",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.pivx; network = bitcoinjs.bitcoin.networks.pivx;
setHdCoin(119); setHdCoin(119);
@@ -1456,7 +1447,7 @@
}, },
{ {
name: "PIVX - PIVX Testnet", name: "PIVX - PIVX Testnet",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.pivxtestnet; network = bitcoinjs.bitcoin.networks.pivxtestnet;
setHdCoin(1); setHdCoin(1);
@@ -1464,7 +1455,7 @@
}, },
{ {
name: "PPC - Peercoin", name: "PPC - Peercoin",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.peercoin; network = bitcoinjs.bitcoin.networks.peercoin;
setHdCoin(6); setHdCoin(6);
@@ -1472,7 +1463,7 @@
}, },
{ {
name: "SDC - ShadowCash", name: "SDC - ShadowCash",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.shadow; network = bitcoinjs.bitcoin.networks.shadow;
setHdCoin(35); setHdCoin(35);
@@ -1480,7 +1471,7 @@
}, },
{ {
name: "SDC - ShadowCash Testnet", name: "SDC - ShadowCash Testnet",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.shadowtn; network = bitcoinjs.bitcoin.networks.shadowtn;
setHdCoin(1); setHdCoin(1);
@@ -1488,7 +1479,7 @@
}, },
{ {
name: "SLM - Slimcoin", name: "SLM - Slimcoin",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.slimcoin; network = bitcoinjs.bitcoin.networks.slimcoin;
setHdCoin(63); setHdCoin(63);
@@ -1496,7 +1487,7 @@
}, },
{ {
name: "SLM - Slimcoin Testnet", name: "SLM - Slimcoin Testnet",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.slimcointn; network = bitcoinjs.bitcoin.networks.slimcointn;
setHdCoin(111); setHdCoin(111);
@@ -1504,7 +1495,7 @@
}, },
{ {
name: "USNBT - NuBits", name: "USNBT - NuBits",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.nubits; network = bitcoinjs.bitcoin.networks.nubits;
setHdCoin(12); setHdCoin(12);
@@ -1512,7 +1503,7 @@
}, },
{ {
name: "VIA - Viacoin", name: "VIA - Viacoin",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.viacoin; network = bitcoinjs.bitcoin.networks.viacoin;
setHdCoin(14); setHdCoin(14);
@@ -1520,7 +1511,7 @@
}, },
{ {
name: "VIA - Viacoin Testnet", name: "VIA - Viacoin Testnet",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.viacointestnet; network = bitcoinjs.bitcoin.networks.viacointestnet;
setHdCoin(1); setHdCoin(1);
@@ -1528,7 +1519,7 @@
}, },
{ {
name: "XMY - Myriadcoin", name: "XMY - Myriadcoin",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.myriadcoin; network = bitcoinjs.bitcoin.networks.myriadcoin;
setHdCoin(90); setHdCoin(90);
@@ -1536,7 +1527,7 @@
}, },
{ {
name: "XRP - Ripple", name: "XRP - Ripple",
p2wpkhNestedInP2shAvailable: false, segwitAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.bitcoin; network = bitcoinjs.bitcoin.networks.bitcoin;
setHdCoin(144); setHdCoin(144);
tests/spec/tests.js
-25
View File
@@ -2504,31 +2504,6 @@ it('Uses ltub by default for litecoin, but can be set to xprv', function(done) {
}); });
}); });
// BIP32 tab can use P2WPKH Nested In P2SH
// github issue 91 part 2
// https://github.com/iancoleman/bip39/issues/91
// generate new addresses from xpub?
it('Uses xprv by default for litecoin, but can be set to ltpv', function(done) {
// use p2wpkh addresses
driver.executeScript(function() {
$(".p2wpkh-nested-in-p2sh").prop("checked", true);
});
// use bip32 tab
driver.findElement(By.css('#bip32-tab a'))
.click()
// use testnet
selectNetwork("BTC - Bitcoin Testnet");
// Set root xpub to BIP49 official test vector account 0
driver.findElement(By.css('.root-key'))
.sendKeys("tpubDD7tXK8KeQ3YY83yWq755fHY2JW8Ha8Q765tknUM5rSvjPcGWfUppDFMpQ1ScziKfW3ZNtZvAD7M3u7bSs7HofjTD3KP3YxPK7X6hwV8Rk2");
driver.sleep(generateDelay).then(function() {
getFirstAddress(function(address) {
expect(address).toBe("2Mww8dCYPUpKHofjgcXcBCEGmniw9CoaiD2");
done();
});
});
});
// github issue 99 // github issue 99
// https://github.com/iancoleman/bip39/issues/99#issuecomment-327094159 // https://github.com/iancoleman/bip39/issues/99#issuecomment-327094159
// "warn me emphatically when they have detected invalid input" to the entropy field // "warn me emphatically when they have detected invalid input" to the entropy field