X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjs%2Findex.js;h=b2fb17ecf254df328d119ffc361b37ea2191006c;hb=93c3ef47579733040dbc6eec865b528d1ca49911;hp=b1559ef8fbac65e01d047c70a57c026e4327abba;hpb=fe8f2d140d9c9e260ebeab7135aa5197b27df406;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git

diff --git a/src/js/index.js b/src/js/index.js
index b1559ef..b2fb17e 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -111,7 +111,7 @@
         DOM.bip44change.on("input", calcForDerivationPath);
         DOM.bip49account.on("input", calcForDerivationPath);
         DOM.bip49change.on("input", calcForDerivationPath);
-        DOM.tab.on("shown.bs.tab", calcForDerivationPath);
+        DOM.tab.on("shown.bs.tab", tabChanged);
         DOM.hardenedAddresses.on("change", calcForDerivationPath);
         DOM.useP2wpkhNestedInP2sh.on("change", calcForDerivationPath);
         DOM.indexToggle.on("click", toggleIndexes);
@@ -214,6 +214,35 @@
         calcForDerivationPath();
     }
 
+    function tabChanged() {
+        showPending();
+        adjustNetworkForBip49();
+        var phrase = DOM.phrase.val();
+        if (phrase != "") {
+            // Calculate and display for mnemonic
+            var errorText = findPhraseErrors(phrase);
+            if (errorText) {
+                showValidationError(errorText);
+                return;
+            }
+            // Calculate and display
+            var passphrase = DOM.passphrase.val();
+            calcBip32RootKeyFromSeed(phrase, passphrase);
+        }
+        else {
+            // Calculate and display for root key
+            var rootKeyBase58 = DOM.rootKey.val();
+            var errorText = validateRootKey(rootKeyBase58);
+            if (errorText) {
+                showValidationError(errorText);
+                return;
+            }
+            // Calculate and display
+            calcBip32RootKeyFromBase58(rootKeyBase58);
+        }
+        calcForDerivationPath();
+    }
+
     function delayedEntropyChanged() {
         hideValidationError();
         showPending();
@@ -644,12 +673,16 @@
         })());
     }
 
+    function P2wpkhNestedInP2shSelected() {
+        return bip49TabSelected() || (bip32TabSelected() && useP2wpkhNestedInP2sh());
+    }
+
     function TableRow(index, isLast) {
 
         var self = this;
         this.shouldGenerate = true;
         var useHardenedAddresses = DOM.hardenedAddresses.prop("checked");
-        var isP2wpkhNestedInP2sh = bip49TabSelected() || (bip32TabSelected() && useP2wpkhNestedInP2sh());
+        var isP2wpkhNestedInP2sh = P2wpkhNestedInP2shSelected();
         var p2wpkhNestedInP2shAvailable = networkHasBip49();
 
         function init() {
@@ -1229,6 +1262,35 @@
         }
     }
 
+    function adjustNetworkForBip49() {
+        // If bip49 is selected the xpub/xprv prefixes need to be adjusted
+        // to avoid accidentally importing BIP49 xpub to BIP44 watch only
+        // wallet.
+        // See https://github.com/iancoleman/bip39/issues/125
+        if (P2wpkhNestedInP2shSelected()) {
+            if (network == bitcoinjs.bitcoin.networks.bitcoin) {
+                network = bitcoinjs.bitcoin.networks.bitcoinBip49;
+            }
+            else if (network == bitcoinjs.bitcoin.networks.testnet) {
+                network = bitcoinjs.bitcoin.networks.testnetBip49;
+            }
+            else if (network == bitcoinjs.bitcoin.networks.litecoin) {
+                network = bitcoinjs.bitcoin.networks.litecoinBip49;
+            }
+        }
+        else {
+            if (network == bitcoinjs.bitcoin.networks.bitcoinBip49) {
+                network = bitcoinjs.bitcoin.networks.bitcoin;
+            }
+            else if (network == bitcoinjs.bitcoin.networks.testnetBip49) {
+                network = bitcoinjs.bitcoin.networks.testnet;
+            }
+            else if (network == bitcoinjs.bitcoin.networks.litecoinBip49) {
+                network = bitcoinjs.bitcoin.networks.litecoin;
+            }
+        }
+    }
+
     var networks = [
         {
             name: "BCH - Bitcoin Cash",