X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjs%2Findex.js;h=3a5a0ef3fecc7f4d804bc84bc118832c28f20527;hb=e40acc3ab0e78ca3a9b63d0b1c9e16f804da104e;hp=b1876cbdd11e08e9b1212754f02d355a75c88d25;hpb=daab55dc613a1eef22463356eba1a742cb814cb2;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git

diff --git a/src/js/index.js b/src/js/index.js
index b1876cb..3a5a0ef 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -175,6 +175,10 @@
 
     function delayedPhraseChanged() {
         hideValidationError();
+        seed = null;
+        bip32RootKey = null;
+        bip32ExtendedKey = null;
+        clearAddressesList();
         showPending();
         if (phraseChangeTimeoutEvent != null) {
             clearTimeout(phraseChangeTimeoutEvent);
@@ -184,7 +188,6 @@
 
     function phraseChanged() {
         showPending();
-        hideValidationError();
         setMnemonicLanguage();
         // Get the mnemonic phrase
         var phrase = DOM.phrase.val();
@@ -197,7 +200,6 @@
         var passphrase = DOM.passphrase.val();
         calcBip32RootKeyFromSeed(phrase, passphrase);
         calcForDerivationPath();
-        hidePending();
     }
 
     function delayedEntropyChanged() {
@@ -273,10 +275,9 @@
     }
 
     function calcForDerivationPath() {
-        showPending();
         clearDerivedKeys();
         clearAddressesList();
-        hideValidationError();
+        showPending();
         // Don't show bip49 if it's selected but network doesn't support it
         if (bip49TabSelected() && !networkHasBip49()) {
             return;
@@ -296,7 +297,6 @@
             displayBip49Info();
         }
         displayBip32Info();
-        hidePending();
     }
 
     function generateClicked() {
@@ -603,17 +603,19 @@
                 for (var i=0; i<rows.length; i++) {
                     rows[i].shouldGenerate = false;
                 }
+                hidePending();
             }
 
             for (var i=0; i<total; i++) {
                 var index = i + start;
-                rows.push(new TableRow(index));
+                var isLast = i == total - 1;
+                rows.push(new TableRow(index, isLast));
             }
 
         })());
     }
 
-    function TableRow(index) {
+    function TableRow(index, isLast) {
 
         var self = this;
         this.shouldGenerate = true;
@@ -675,6 +677,9 @@
                     address = bitcoinjs.bitcoin.address.fromOutputScript(scriptpubkey, network)
                 }
                 addAddressToList(indexText, address, pubkey, privkey);
+                if (isLast) {
+                    hidePending();
+                }
             }, 50)
         }
 
@@ -1262,6 +1267,15 @@
                 setHdCoin(2);
             },
         },
+        {
+            name: "MAZA - Maza",
+            bip49available: false,
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.maza;
+                setHdCoin(13);
+            },
+        },
+
         {
             name: "NMC - Namecoin",
             bip49available: false,
@@ -1270,6 +1284,22 @@
                 setHdCoin(7);
             },
         },
+        {
+            name: "PIVX - PIVX",
+            bip49available: false,
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.pivx;
+                setHdCoin(119);
+            },
+        },
+        {
+            name: "PIVX - PIVX Testnet",
+            bip49available: false,
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.pivxtestnet;
+                setHdCoin(1);
+            },
+        },
         {
             name: "PPC - Peercoin",
             bip49available: false,
@@ -1327,19 +1357,19 @@
             },
         },
         {
-            name: "XRP - Ripple",
+            name: "XMY - Myriadcoin",
             bip49available: false,
             onSelect: function() {
-                network = bitcoinjs.bitcoin.networks.bitcoin;
-                setHdCoin(144);
+                network = bitcoinjs.bitcoin.networks.myriadcoin;
+                setHdCoin(90);
             },
         },
         {
-            name: "XMY - Myriadcoin",
+            name: "XRP - Ripple",
             bip49available: false,
             onSelect: function() {
-                network = bitcoinjs.bitcoin.networks.myriadcoin;
-                setHdCoin(90);
+                network = bitcoinjs.bitcoin.networks.bitcoin;
+                setHdCoin(144);
             },
         }
     ]