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

Partially revert Pull 371 BIP44 Default Change

Browse Source
This commit is contained in:
Ian Coleman
2019-12-02 10:24:37 +11:00
parent 732613e44c
commit 55367b989e
2 changed files with 7 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/index.html
+1 -4
View File
@@ -282,10 +282,7 @@
<a href="https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki#change" target="_blank">External / Internal</a> <a href="https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki#change" target="_blank">External / Internal</a>
</label> </label>
<div class="col-sm-10"> <div class="col-sm-10">
<div class="input-group"> <input id="change-bip44" type="text" class="change form-control" value="0">
<input id="change-bip44" type="text" class="change form-control" value="0">
<a class="default-bip44-change-value btn btn-primary input-group-addon" role="button">Default</a>
</div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
src/js/index.js
+6 -32
View File
@@ -15,7 +15,6 @@
var showPrivKey = true; var showPrivKey = true;
var showQr = false; var showQr = false;
var litecoinUseLtub = true; var litecoinUseLtub = true;
var isDefaultBip44ChangeValue = true;
var entropyChangeTimeoutEvent = null; var entropyChangeTimeoutEvent = null;
var phraseChangeTimeoutEvent = null; var phraseChangeTimeoutEvent = null;
@@ -72,7 +71,6 @@
DOM.bip44accountXprv = $("#bip44 .account-xprv"); DOM.bip44accountXprv = $("#bip44 .account-xprv");
DOM.bip44accountXpub = $("#bip44 .account-xpub"); DOM.bip44accountXpub = $("#bip44 .account-xpub");
DOM.bip44change = $("#bip44 .change"); DOM.bip44change = $("#bip44 .change");
DOM.defaultBip44ChangeValue = $("#bip44 .default-bip44-change-value");
DOM.bip49unavailable = $("#bip49 .unavailable"); DOM.bip49unavailable = $("#bip49 .unavailable");
DOM.bip49available = $("#bip49 .available"); DOM.bip49available = $("#bip49 .available");
DOM.bip49path = $("#bip49-path"); DOM.bip49path = $("#bip49-path");
@@ -138,9 +136,7 @@
DOM.litecoinUseLtub.on("change", litecoinUseLtubChanged); DOM.litecoinUseLtub.on("change", litecoinUseLtubChanged);
DOM.bip32path.on("input", calcForDerivationPath); DOM.bip32path.on("input", calcForDerivationPath);
DOM.bip44account.on("input", calcForDerivationPath); DOM.bip44account.on("input", calcForDerivationPath);
DOM.bip44change.on("input", modifiedDefaultBip44ChangeValue);
DOM.bip44change.on("input", calcForDerivationPath); DOM.bip44change.on("input", calcForDerivationPath);
DOM.defaultBip44ChangeValue.on("click", resetDefaultBip44ChangeValue);
DOM.bip49account.on("input", calcForDerivationPath); DOM.bip49account.on("input", calcForDerivationPath);
DOM.bip49change.on("input", calcForDerivationPath); DOM.bip49change.on("input", calcForDerivationPath);
DOM.bip84account.on("input", calcForDerivationPath); DOM.bip84account.on("input", calcForDerivationPath);
@@ -742,14 +738,12 @@
var purpose = parseIntNoNaN(DOM.bip44purpose.val(), 44); var purpose = parseIntNoNaN(DOM.bip44purpose.val(), 44);
var coin = parseIntNoNaN(DOM.bip44coin.val(), 0); var coin = parseIntNoNaN(DOM.bip44coin.val(), 0);
var account = parseIntNoNaN(DOM.bip44account.val(), 0); var account = parseIntNoNaN(DOM.bip44account.val(), 0);
var change = parseIntNoNaN(DOM.bip44change.val(), ""); var change = parseIntNoNaN(DOM.bip44change.val(), 0);
var path = "m"; var path = "m/";
path += "/" + purpose + "'"; path += purpose + "'/";
path += "/" + coin + "'"; path += coin + "'/";
path += "/" + account + "'"; path += account + "'/";
if (change !== "") { path += change;
path += "/" + change;
}
DOM.bip44path.val(path); DOM.bip44path.val(path);
var derivationPath = DOM.bip44path.val(); var derivationPath = DOM.bip44path.val();
console.log("Using derivation path from BIP44 tab: " + derivationPath); console.log("Using derivation path from BIP44 tab: " + derivationPath);
@@ -1758,30 +1752,10 @@
return DOM.bip141tab.hasClass("active"); 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) { function setHdCoin(coinValue) {
DOM.bip44coin.val(coinValue); DOM.bip44coin.val(coinValue);
DOM.bip49coin.val(coinValue); DOM.bip49coin.val(coinValue);
DOM.bip84coin.val(coinValue); DOM.bip84coin.val(coinValue);
setBip44ChangeValue();
} }
function showSegwitAvailable() { function showSegwitAvailable() {