From: iancoleman <coleman.ian@gmail.com>
Date: Tue, 22 Aug 2017 23:30:43 +0000 (+1000)
Subject: Merge pull request #92 from jonspock/master
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git;a=commitdiff_plain;h=e40acc3ab0e78ca3a9b63d0b1c9e16f804da104e;hp=-c

Merge pull request #92 from jonspock/master

Add maza coin, update PIVX in bip39-standalone.html
---

e40acc3ab0e78ca3a9b63d0b1c9e16f804da104e
diff --combined bip39-standalone.html
index 8c2c6a4,c828bdc..f183777
--- a/bip39-standalone.html
+++ b/bip39-standalone.html
@@@ -118,7 -118,7 +118,7 @@@
          <div class="container">
  
              <h1 class="text-center">Mnemonic Code Converter</h1>
 -            <p class="version">v0.2.1</p>
 +            <p class="version">v0.2.2</p>
              <hr>
              <div class="row">
                  <div class="col-md-12">
@@@ -22160,6 -22160,17 +22160,17 @@@ bitcoinjs.bitcoin.networks.dash = 
    wif: 0xcc,
  };
  
+ bitcoinjs.bitcoin.networks.maza = {
+   messagePrefix: "unused",
+   bip32: {
+     public: 0x0488b21e,
+     private: 0x0488ade4
+   },
+   pubKeyHash: 0x32,
+   scriptHash: 0x09,
+   wif: 0xe0,
+ };
+ 
  bitcoinjs.bitcoin.networks.dashtn = {
    messagePrefix: "unused",
    bip32: {
@@@ -46261,10 -46272,6 +46272,10 @@@ window.Entropy = new (function() 
  
      function delayedPhraseChanged() {
          hideValidationError();
 +        seed = null;
 +        bip32RootKey = null;
 +        bip32ExtendedKey = null;
 +        clearAddressesList();
          showPending();
          if (phraseChangeTimeoutEvent != null) {
              clearTimeout(phraseChangeTimeoutEvent);
@@@ -46274,6 -46281,7 +46285,6 @@@
  
      function phraseChanged() {
          showPending();
 -        hideValidationError();
          setMnemonicLanguage();
          // Get the mnemonic phrase
          var phrase = DOM.phrase.val();
@@@ -46286,6 -46294,7 +46297,6 @@@
          var passphrase = DOM.passphrase.val();
          calcBip32RootKeyFromSeed(phrase, passphrase);
          calcForDerivationPath();
 -        hidePending();
      }
  
      function delayedEntropyChanged() {
@@@ -46361,9 -46370,10 +46372,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;
@@@ -46383,6 -46393,7 +46394,6 @@@
              displayBip49Info();
          }
          displayBip32Info();
 -        hidePending();
      }
  
      function generateClicked() {
@@@ -46689,19 -46700,17 +46700,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;
@@@ -46763,9 -46772,6 +46774,9 @@@
                      address = bitcoinjs.bitcoin.address.fromOutputScript(scriptpubkey, network)
                  }
                  addAddressToList(indexText, address, pubkey, privkey);
 +                if (isLast) {
 +                    hidePending();
 +                }
              }, 50)
          }
  
@@@ -47353,6 -47359,15 +47364,15 @@@
                  setHdCoin(2);
              },
          },
+         {
+             name: "MAZA - Maza",
+             bip49available: false,
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.maza;
+                 setHdCoin(13);
+             },
+         },
+ 
          {
              name: "NMC - Namecoin",
              bip49available: false,
diff --combined src/js/index.js
index 678d52b,79f4e4c..3a5a0ef
--- a/src/js/index.js
+++ b/src/js/index.js
@@@ -175,10 -175,6 +175,10 @@@
  
      function delayedPhraseChanged() {
          hideValidationError();
 +        seed = null;
 +        bip32RootKey = null;
 +        bip32ExtendedKey = null;
 +        clearAddressesList();
          showPending();
          if (phraseChangeTimeoutEvent != null) {
              clearTimeout(phraseChangeTimeoutEvent);
@@@ -188,6 -184,7 +188,6 @@@
  
      function phraseChanged() {
          showPending();
 -        hideValidationError();
          setMnemonicLanguage();
          // Get the mnemonic phrase
          var phrase = DOM.phrase.val();
@@@ -200,6 -197,7 +200,6 @@@
          var passphrase = DOM.passphrase.val();
          calcBip32RootKeyFromSeed(phrase, passphrase);
          calcForDerivationPath();
 -        hidePending();
      }
  
      function delayedEntropyChanged() {
@@@ -275,9 -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;
@@@ -297,6 -296,7 +297,6 @@@
              displayBip49Info();
          }
          displayBip32Info();
 -        hidePending();
      }
  
      function generateClicked() {
@@@ -603,19 -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;
@@@ -677,9 -675,6 +677,9 @@@
                      address = bitcoinjs.bitcoin.address.fromOutputScript(scriptpubkey, network)
                  }
                  addAddressToList(indexText, address, pubkey, privkey);
 +                if (isLast) {
 +                    hidePending();
 +                }
              }, 50)
          }
  
@@@ -1267,6 -1262,15 +1267,15 @@@
                  setHdCoin(2);
              },
          },
+         {
+             name: "MAZA - Maza",
+             bip49available: false,
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.maza;
+                 setHdCoin(13);
+             },
+         },
+ 
          {
              name: "NMC - Namecoin",
              bip49available: false,