Add a button to remove the "change" in the derivation path for ethereum

diff --git a/src/index.html b/src/index.html
index 36d753b84c401a759d054a1931447408e5b6e43d..407c246c27407539c8f8d542d4f21925dc86a449 100644 (file)
--- a/src/index.html
+++ b/src/index.html
@@ -273,7 +273,10 @@
                                         <a href="https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki#change" target="_blank">External / Internal</a>
                                     </label>
                                     <div class="col-sm-10">
                                         <a href="https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki#change" target="_blank">External / Internal</a>
                                     </label>
                                     <div class="col-sm-10">

-                                        <input id="change-bip44" type="text" class="change form-control" value="0">
+                                        <div class="input-group">
+                                          <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 class="form-group">
                                     </div>
                                 </div>
                                 <div class="form-group">

diff --git a/src/js/index.js b/src/js/index.js
index cbe0255a32630856da567c8d208a407702fe1227..ce0e3dede649929287ffd208498f3841372ccfd7 100644 (file)
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -15,6 +15,7 @@
     var showPrivKey = true;
     var showQr = false;
     var litecoinUseLtub = true;
     var showPrivKey = true;
     var showQr = false;
     var litecoinUseLtub = true;

+    var isDefaultBip44ChangeValue = true;

 
     var entropyChangeTimeoutEvent = null;
     var phraseChangeTimeoutEvent = null;
 
     var entropyChangeTimeoutEvent = null;
     var phraseChangeTimeoutEvent = null;


@@ -69,6 +70,7 @@
     DOM.bip44accountXprv = $("#bip44 .account-xprv");
     DOM.bip44accountXpub = $("#bip44 .account-xpub");
     DOM.bip44change = $("#bip44 .change");
     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.bip49unavailable = $("#bip49 .unavailable");
     DOM.bip49available = $("#bip49 .available");
     DOM.bip49path = $("#bip49-path");


@@ -134,7 +136,9 @@
         DOM.litecoinUseLtub.on("change", litecoinUseLtubChanged);
         DOM.bip32path.on("input", calcForDerivationPath);
         DOM.bip44account.on("input", calcForDerivationPath);
         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.bip44change.on("input", calcForDerivationPath);

+        DOM.defaultBip44ChangeValue.on("click", resetDefaultBip44ChangeValue);

         DOM.bip49account.on("input", calcForDerivationPath);
         DOM.bip49change.on("input", calcForDerivationPath);
         DOM.bip84account.on("input", calcForDerivationPath);
         DOM.bip49account.on("input", calcForDerivationPath);
         DOM.bip49change.on("input", calcForDerivationPath);
         DOM.bip84account.on("input", calcForDerivationPath);


@@ -640,12 +644,14 @@
             var purpose = parseIntNoNaN(DOM.bip44purpose.val(), 44);
             var coin = parseIntNoNaN(DOM.bip44coin.val(), 0);
             var account = parseIntNoNaN(DOM.bip44account.val(), 0);
             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(), 0);
-            var path = "m/";
-            path += purpose + "'/";
-            path += coin + "'/";
-            path += account + "'/";
-            path += change;
+            var change = parseIntNoNaN(DOM.bip44change.val(), "");
+            var path = "m";
+            path += "/" + purpose + "'";
+            path += "/" + coin + "'";
+            path += "/" + account + "'";
+            if (change !== "") {
+              path += "/" + change;
+            }

             DOM.bip44path.val(path);
             var derivationPath = DOM.bip44path.val();
             console.log("Using derivation path from BIP44 tab: " + derivationPath);
             DOM.bip44path.val(path);
             var derivationPath = DOM.bip44path.val();
             console.log("Using derivation path from BIP44 tab: " + derivationPath);


@@ -910,14 +916,7 @@
                     indexText = indexText + "'";
                 }
                 // Ethereum values are different
                     indexText = indexText + "'";
                 }
                 // Ethereum values are different

-                if ((networks[DOM.network.val()].name == "ETH - Ethereum")
-                    || (networks[DOM.network.val()].name == "ETC - Ethereum Classic")
-                    || (networks[DOM.network.val()].name == "PIRL - Pirl")
-                    || (networks[DOM.network.val()].name == "MIX - MIX")
-                    || (networks[DOM.network.val()].name == "MUSIC - Musicoin")
-                    || (networks[DOM.network.val()].name == "POA - Poa")
-                    || (networks[DOM.network.val()].name == "EXP - Expanse")
-                    || (networks[DOM.network.val()].name == "CLO - Callisto")) {
+                if (networkIsEthereum()) {

                     var privKeyBuffer = keyPair.d.toBuffer(32);
                     privkey = privKeyBuffer.toString('hex');
                     var addressBuffer = ethUtil.privateToAddress(privKeyBuffer);
                     var privKeyBuffer = keyPair.d.toBuffer(32);
                     privkey = privKeyBuffer.toString('hex');
                     var addressBuffer = ethUtil.privateToAddress(privKeyBuffer);


@@ -1471,6 +1470,18 @@
         return DOM.bip32tab.hasClass("active");
     }
 
         return DOM.bip32tab.hasClass("active");
     }
 

+    function networkIsEthereum() {
+        var name = networks[DOM.network.val()].name;
+        return (name == "ETH - Ethereum")
+                    || (name == "ETC - Ethereum Classic")
+                    || (name == "PIRL - Pirl")
+                    || (name == "MIX - MIX")
+                    || (name == "MUSIC - Musicoin")
+                    || (name == "POA - Poa")
+                    || (name == "EXP - Expanse")
+                    || (name == "CLO - Callisto");
+    }
+

     function networkHasSegwit() {
         var n = network;
         if ("baseNetwork" in network) {
     function networkHasSegwit() {
         var n = network;
         if ("baseNetwork" in network) {


@@ -1500,10 +1511,30 @@
         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) {
         DOM.bip44coin.val(coinValue);
         DOM.bip49coin.val(coinValue);
         DOM.bip84coin.val(coinValue);
     function setHdCoin(coinValue) {
         DOM.bip44coin.val(coinValue);
         DOM.bip49coin.val(coinValue);
         DOM.bip84coin.val(coinValue);

+        setBip44ChangeValue();

     }
 
     function showSegwitAvailable() {
     }
 
     function showSegwitAvailable() {