From: iancoleman <coleman.ian@gmail.com>
Date: Sun, 19 Feb 2017 00:23:41 +0000 (+1100)
Subject: Merge pull request #55 from galeksandrp/patch-1
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=5de5781ad732f71ba62d8a1640eb946e853e3c8a;hp=-c;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git

Merge pull request #55 from galeksandrp/patch-1

Add client select
---

5de5781ad732f71ba62d8a1640eb946e853e3c8a
diff --combined src/index.html
index 9003f89,1c2ffcf..7dc53a7
--- a/src/index.html
+++ b/src/index.html
@@@ -182,9 -182,9 +182,9 @@@
                                      <label class="col-sm-3 control-label" data-translate>Mnemonic Length</label>
                                      <div class="col-sm-9">
                                          <select class="mnemonic-length form-control">
 -                                            <option value="raw" data-translate>From entropy length (3 words per 32 bits)</option>
 +                                            <option value="raw" selected data-translate>Use Raw Entropy (3 words per 32 bits)</option>
                                              <option value="12">12 <span data-translate>Words</span></option>
 -                                            <option value="15" selected>15 <span data-translate>Words</option>
 +                                            <option value="15">15 <span data-translate>Words</option>
                                              <option value="18">18 <span data-translate>Words</span></option>
                                              <option value="21">21 <span data-translate>Words</span></option>
                                              <option value="24">24 <span data-translate>Words</span></option>
@@@ -253,6 -253,14 +253,14 @@@
                                  </select>
                              </div>
                          </div>
+                         <div class="form-group">
+                             <label for="client-phrase" class="col-sm-2 control-label" data-translate>Client</label>
+                             <div class="col-sm-10">
+                                 <select id="client-phrase" class="client form-control">
+                                     <!-- populated by javascript -->
+                                 </select>
+                             </div>
+                         </div>
                          <div class="form-group">
                              <label for="root-key" class="col-sm-2 control-label" data-translate>BIP32 Root Key</label>
                              <div class="col-sm-10">
@@@ -393,7 -401,7 +401,7 @@@
                                      </div>
                                  </div>
                                  <div class="form-group">
-                                     <label class="col-sm-2 control-label" data-translate>Block Explorers</label>
+                                     <label class="col-sm-2 control-label" data-translate>Block Explorers and other clients</label>
                                      <div class="col-sm-10">
                                          <p class="form-control no-border">
                                              <span data-translate-html>Use path <code>m/44'/0'/0'</code>.</span>
@@@ -403,6 -411,13 +411,13 @@@
                                              <span data-translate>Can be used with</span>:
                                              <a href="https://blockchain.info/" target="_blank">blockchain.info</a>
                                          </p>
+                                         <p class="form-control no-border">
+                                             <span data-translate-html>Use path <code>m/0'/0</code>.</span>
+                                         </p>
+                                         <p class="form-control no-border">
+                                             <span data-translate>Can be used with</span>:
+                                             <a href="https://multibit.org/" target="_blank">MultiBit HD</a>
+                                         </p>
                                      </div>
                                  </div>
                              </form>
@@@ -651,14 -666,12 +666,14 @@@
                  <td class="privkey"><span data-show-qr></span></td>
              </tr>
          </script>
 +        <script src="js/polyfill.es6.js"></script>
          <script src="js/jquery.min.js"></script>
          <script src="js/bootstrap.min.js"></script>
          <script src="js/levenshtein.js"></script>
          <script src="js/jquery.qrcode.min.js"></script>
          <script src="js/bitcoinjs-1-5-7.js"></script>
          <script src="js/bitcoinjs-extensions.js"></script>
 +        <script src="js/ethereumjs-util.js"></script>
          <script src="js/sjcl-bip39.js"></script>
          <script src="js/translate.js"></script>
          <script src="js/phrases_en.js"></script>
diff --combined src/js/index.js
index 4c947a4,f593b3a..8c54cab
--- a/src/js/index.js
+++ b/src/js/index.js
@@@ -23,7 -23,9 +23,9 @@@
  
      var DOM = {};
      DOM.network = $(".network");
+     DOM.client = $(".client");
      DOM.phraseNetwork = $("#network-phrase");
+     DOM.phraseClient = $("#client-phrase");
      DOM.useEntropy = $(".use-entropy");
      DOM.entropyContainer = $(".entropy-container");
      DOM.entropy = $(".entropy");
@@@ -77,6 -79,7 +79,7 @@@
      function init() {
          // Events
          DOM.network.on("change", networkChanged);
+         DOM.client.on("change", clientChanged);
          DOM.useEntropy.on("change", setEntropyVisibility);
          DOM.entropy.on("input", delayedEntropyChanged);
          DOM.entropyMnemonicLength.on("change", entropyChanged);
@@@ -102,6 -105,7 +105,7 @@@
          hidePending();
          hideValidationError();
          populateNetworkSelect();
+         populateClientSelect();
      }
  
      // Event handlers
@@@ -116,6 -120,17 +120,17 @@@
              rootKeyChanged();
          }
      }
+     
+     function clientChanged(e) {
+         var clientIndex = e.target.value;
+         clients[clientIndex].onSelect();
+         if (seed != null) {
+             phraseChanged();
+         }
+         else {
+             rootKeyChanged();
+         }
+     }
  
      function setEntropyVisibility() {
          if (isUsingOwnEntropy()) {
@@@ -564,15 -579,6 +579,15 @@@
                  if (useHardenedAddresses) {
                      indexText = indexText + "'";
                  }
 +                // Ethereum values are different
 +                if (networks[DOM.network.val()].name == "Ethereum") {
 +                    var privKeyBuffer = key.privKey.d.toBuffer();
 +                    privkey = privKeyBuffer.toString('hex');
 +                    var addressBuffer = ethUtil.privateToAddress(privKeyBuffer);
 +                    var hexAddress = addressBuffer.toString('hex');
 +                    var checksumAddress = ethUtil.toChecksumAddress(hexAddress);
 +                    address = ethUtil.addHexPrefix(checksumAddress);
 +                }
                  addAddressToList(indexText, address, pubkey, privkey);
              }, 50)
          }
@@@ -710,6 -716,16 +725,16 @@@
              DOM.phraseNetwork.append(option);
          }
      }
+     
+     function populateClientSelect() {
+         for (var i=0; i<clients.length; i++) {
+             var client = clients[i];
+             var option = $("<option>");
+             option.attr("value", i);
+             option.text(client.name);
+             DOM.phraseClient.append(option);
+         }
+     }
  
      function getLanguage() {
          var defaultLanguage = "english";
@@@ -1132,14 -1148,31 +1157,38 @@@
                  DOM.bip44coin.val(6);
              },
          },
 +        {
 +            name: "Ethereum",
 +            onSelect: function() {
 +                network = bitcoin.networks.bitcoin;
 +                DOM.bip44coin.val(60);
 +            },
 +        },
      ]
+     
+     var clients = [
+         {
+             name: "Bitcoin Core",
+             onSelect: function() {
+                 DOM.bip32path.val("m/0'/0'");
+                 DOM.hardenedAddresses.prop('checked', true);
+             },
+         },
+         {
+             name: "blockchain.info",
+             onSelect: function() {
+                 DOM.bip32path.val("m/44'/0'/0'");
+                 DOM.hardenedAddresses.prop('checked', false);
+             },
+         },
+         {
+             name: "MultiBit HD",
+             onSelect: function() {
+                 DOM.bip32path.val("m/0'/0");
+                 DOM.hardenedAddresses.prop('checked', false);
+             },
+         }
+     ]
  
      init();