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

Release v0.2.5

Browse Source
This commit is contained in:
Ian Coleman
2017-09-01 12:35:42 +10:00
parent 88311463c7
commit 0a8d06d03e
3 changed files with 60 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bip39-standalone.html
+53 -38
View File
@@ -118,7 +118,7 @@
<div class="container"> <div class="container">
<h1 class="text-center">Mnemonic Code Converter</h1> <h1 class="text-center">Mnemonic Code Converter</h1>
<p class="version">v0.2.4</p> <p class="version">v0.2.5</p>
<hr> <hr>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
@@ -412,6 +412,13 @@
<span data-translate>Use hardened addresses</span> <span data-translate>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 data-translate>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" data-translate>Bitcoin Core</label> <label for="core-path" class="col-sm-2 control-label" data-translate>Bitcoin Core</label>
<div class="col-sm-10"> <div class="col-sm-10">
@@ -46190,6 +46197,7 @@ window.Entropy = new (function() {
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.addresses = $(".addresses"); DOM.addresses = $(".addresses");
DOM.rowsToAdd = $(".rows-to-add"); DOM.rowsToAdd = $(".rows-to-add");
DOM.more = $(".more"); DOM.more = $(".more");
@@ -46226,6 +46234,7 @@ window.Entropy = new (function() {
DOM.bip49change.on("input", calcForDerivationPath); DOM.bip49change.on("input", calcForDerivationPath);
DOM.tab.on("shown.bs.tab", calcForDerivationPath); DOM.tab.on("shown.bs.tab", calcForDerivationPath);
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);
@@ -46248,11 +46257,11 @@ window.Entropy = new (function() {
var networkIndex = e.target.value; var networkIndex = e.target.value;
var network = networks[networkIndex]; var network = networks[networkIndex];
network.onSelect(); network.onSelect();
if (network.bip49available) { if (network.p2wpkhNestedInP2shAvailable) {
showBip49(); showP2wpkhNestedInP2shAvailable();
} }
else { else {
hideBip49(); showP2wpkhNestedInP2shUnavailable();
} }
if (seed != null) { if (seed != null) {
phraseChanged(); phraseChanged();
@@ -46384,7 +46393,6 @@ window.Entropy = new (function() {
function rootKeyChanged() { function rootKeyChanged() {
showPending(); showPending();
hideValidationError(); hideValidationError();
// Validate the root key TODO
var rootKeyBase58 = DOM.rootKey.val(); var rootKeyBase58 = DOM.rootKey.val();
var errorText = validateRootKey(rootKeyBase58); var errorText = validateRootKey(rootKeyBase58);
if (errorText) { if (errorText) {
@@ -46577,7 +46585,7 @@ window.Entropy = new (function() {
function validateRootKey(rootKeyBase58) { function validateRootKey(rootKeyBase58) {
try { try {
bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58); bitcoinjs.bitcoin.HDNode.fromBase58(rootKeyBase58, network);
} }
catch (e) { catch (e) {
return "Invalid root key"; return "Invalid root key";
@@ -46755,8 +46763,8 @@ window.Entropy = new (function() {
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 isBip49 = bip49TabSelected(); var isP2wpkhNestedInP2sh = bip49TabSelected() || (bip32TabSelected() && useP2wpkhNestedInP2sh());
var bip49available = networkHasBip49(); var p2wpkhNestedInP2shAvailable = networkHasBip49();
function init() { function init() {
calculateValues(); calculateValues();
@@ -46801,8 +46809,8 @@ window.Entropy = new (function() {
address = convertRippleAdrr(address); address = convertRippleAdrr(address);
} }
// BIP49 addresses are different // BIP49 addresses are different
if (isBip49) { if (isP2wpkhNestedInP2sh) {
if (!bip49available) { if (!p2wpkhNestedInP2shAvailable) {
return; return;
} }
var keyhash = bitcoinjs.bitcoin.crypto.hash160(key.getPublicKeyBuffer()); var keyhash = bitcoinjs.bitcoin.crypto.hash160(key.getPublicKeyBuffer());
@@ -47282,8 +47290,12 @@ window.Entropy = new (function() {
return DOM.bip32tab.hasClass("active"); return DOM.bip32tab.hasClass("active");
} }
function useP2wpkhNestedInP2sh() {
return DOM.useP2wpkhNestedInP2sh.prop("checked");
}
function networkHasBip49() { function networkHasBip49() {
return networks[DOM.network.val()].bip49available; return networks[DOM.network.val()].p2wpkhNestedInP2shAvailable;
} }
function bip49TabSelected() { function bip49TabSelected() {
@@ -47295,20 +47307,23 @@ window.Entropy = new (function() {
DOM.bip49coin.val(coinValue); DOM.bip49coin.val(coinValue);
} }
function showBip49() { function showP2wpkhNestedInP2shAvailable() {
DOM.bip49unavailable.addClass("hidden"); DOM.bip49unavailable.addClass("hidden");
DOM.bip49available.removeClass("hidden"); DOM.bip49available.removeClass("hidden");
DOM.useP2wpkhNestedInP2sh.prop("disabled", false);
} }
function hideBip49() { function showP2wpkhNestedInP2shUnavailable() {
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);
} }
var networks = [ var networks = [
{ {
name: "BCH - Bitcoin Cash", name: "BCH - Bitcoin Cash",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.bitcoin; network = bitcoinjs.bitcoin.networks.bitcoin;
setHdCoin(145); setHdCoin(145);
@@ -47316,7 +47331,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "BTC - Bitcoin", name: "BTC - Bitcoin",
bip49available: true, p2wpkhNestedInP2shAvailable: true,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.bitcoin; network = bitcoinjs.bitcoin.networks.bitcoin;
setHdCoin(0); setHdCoin(0);
@@ -47324,7 +47339,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "BTC - Bitcoin Testnet", name: "BTC - Bitcoin Testnet",
bip49available: true, p2wpkhNestedInP2shAvailable: true,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.testnet; network = bitcoinjs.bitcoin.networks.testnet;
setHdCoin(1); setHdCoin(1);
@@ -47332,7 +47347,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "CLAM - Clams", name: "CLAM - Clams",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.clam; network = bitcoinjs.bitcoin.networks.clam;
setHdCoin(23); setHdCoin(23);
@@ -47340,7 +47355,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "CRW - Crown", name: "CRW - Crown",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.crown; network = bitcoinjs.bitcoin.networks.crown;
setHdCoin(72); setHdCoin(72);
@@ -47348,7 +47363,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "DASH - Dash", name: "DASH - Dash",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.dash; network = bitcoinjs.bitcoin.networks.dash;
setHdCoin(5); setHdCoin(5);
@@ -47356,7 +47371,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "DASH - Dash Testnet", name: "DASH - Dash Testnet",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.dashtn; network = bitcoinjs.bitcoin.networks.dashtn;
setHdCoin(1); setHdCoin(1);
@@ -47364,7 +47379,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "DOGE - Dogecoin", name: "DOGE - Dogecoin",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.dogecoin; network = bitcoinjs.bitcoin.networks.dogecoin;
setHdCoin(3); setHdCoin(3);
@@ -47372,7 +47387,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "ETH - Ethereum", name: "ETH - Ethereum",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.bitcoin; network = bitcoinjs.bitcoin.networks.bitcoin;
setHdCoin(60); setHdCoin(60);
@@ -47380,7 +47395,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "GAME - GameCredits", name: "GAME - GameCredits",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.game; network = bitcoinjs.bitcoin.networks.game;
setHdCoin(101); setHdCoin(101);
@@ -47388,7 +47403,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "JBS - Jumbucks", name: "JBS - Jumbucks",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.jumbucks; network = bitcoinjs.bitcoin.networks.jumbucks;
setHdCoin(26); setHdCoin(26);
@@ -47396,7 +47411,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "LTC - Litecoin", name: "LTC - Litecoin",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.litecoin; network = bitcoinjs.bitcoin.networks.litecoin;
setHdCoin(2); setHdCoin(2);
@@ -47405,7 +47420,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "MAZA - Maza", name: "MAZA - Maza",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.maza; network = bitcoinjs.bitcoin.networks.maza;
setHdCoin(13); setHdCoin(13);
@@ -47414,7 +47429,7 @@ window.Entropy = new (function() {
{ {
name: "NMC - Namecoin", name: "NMC - Namecoin",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.namecoin; network = bitcoinjs.bitcoin.networks.namecoin;
setHdCoin(7); setHdCoin(7);
@@ -47422,7 +47437,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "PIVX - PIVX", name: "PIVX - PIVX",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.pivx; network = bitcoinjs.bitcoin.networks.pivx;
setHdCoin(119); setHdCoin(119);
@@ -47430,7 +47445,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "PIVX - PIVX Testnet", name: "PIVX - PIVX Testnet",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.pivxtestnet; network = bitcoinjs.bitcoin.networks.pivxtestnet;
setHdCoin(1); setHdCoin(1);
@@ -47438,7 +47453,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "PPC - Peercoin", name: "PPC - Peercoin",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.peercoin; network = bitcoinjs.bitcoin.networks.peercoin;
setHdCoin(6); setHdCoin(6);
@@ -47446,7 +47461,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "SDC - ShadowCash", name: "SDC - ShadowCash",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.shadow; network = bitcoinjs.bitcoin.networks.shadow;
setHdCoin(35); setHdCoin(35);
@@ -47454,7 +47469,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "SDC - ShadowCash Testnet", name: "SDC - ShadowCash Testnet",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.shadowtn; network = bitcoinjs.bitcoin.networks.shadowtn;
setHdCoin(1); setHdCoin(1);
@@ -47462,7 +47477,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "SLM - Slimcoin", name: "SLM - Slimcoin",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.slimcoin; network = bitcoinjs.bitcoin.networks.slimcoin;
setHdCoin(63); setHdCoin(63);
@@ -47470,7 +47485,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "SLM - Slimcoin Testnet", name: "SLM - Slimcoin Testnet",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.slimcointn; network = bitcoinjs.bitcoin.networks.slimcointn;
setHdCoin(111); setHdCoin(111);
@@ -47478,7 +47493,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "VIA - Viacoin", name: "VIA - Viacoin",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.viacoin; network = bitcoinjs.bitcoin.networks.viacoin;
setHdCoin(14); setHdCoin(14);
@@ -47486,7 +47501,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "VIA - Viacoin Testnet", name: "VIA - Viacoin Testnet",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.viacointestnet; network = bitcoinjs.bitcoin.networks.viacointestnet;
setHdCoin(1); setHdCoin(1);
@@ -47494,7 +47509,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "XMY - Myriadcoin", name: "XMY - Myriadcoin",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.myriadcoin; network = bitcoinjs.bitcoin.networks.myriadcoin;
setHdCoin(90); setHdCoin(90);
@@ -47502,7 +47517,7 @@ window.Entropy = new (function() {
}, },
{ {
name: "XRP - Ripple", name: "XRP - Ripple",
bip49available: false, p2wpkhNestedInP2shAvailable: false,
onSelect: function() { onSelect: function() {
network = bitcoinjs.bitcoin.networks.bitcoin; network = bitcoinjs.bitcoin.networks.bitcoin;
setHdCoin(144); setHdCoin(144);
changelog.md
+6
View File
@@ -1,3 +1,9 @@
# 0.2.5
* Rename variables for clarity between BIP49 and P2WPKH Nested In P2SH
* Fix bug for validation of root key when using non-bitcoin networks
* Add option to use P2WPKH Nested In P2SH addresses on BIP32 tab
# 0.2.4 # 0.2.4
* Show error when using xpub with hardened addresses * Show error when using xpub with hardened addresses
src/index.html
+1 -1
View File
@@ -114,7 +114,7 @@
<div class="container"> <div class="container">
<h1 class="text-center">Mnemonic Code Converter</h1> <h1 class="text-center">Mnemonic Code Converter</h1>
<p class="version">v0.2.4</p> <p class="version">v0.2.5</p>
<hr> <hr>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">