From: iancoleman <1281387+iancoleman@users.noreply.github.com>
Date: Thu, 4 Jul 2019 01:39:06 +0000 (+1000)
Subject: Merge pull request #287 from sui77/master
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git;a=commitdiff_plain;h=a36c509c91ea9319f000819889830d3cafe23f02;hp=-c

Merge pull request #287 from sui77/master

XLM Stellar Lumens
---

a36c509c91ea9319f000819889830d3cafe23f02
diff --combined src/index.html
index 9df24fe,d64d27e..bd34b55
--- a/src/index.html
+++ b/src/index.html
@@@ -928,7 -928,6 +928,7 @@@
          <script src="js/ripple-util.js"></script>
          <script src="js/bchaddrjs-0.2.1.js"></script>
          <script src="js/nebulas-account.js"></script>
 +        <script src="js/eos-util.js"></script>
          <script src="js/sjcl-bip39.js"></script>
          <script src="js/wordlist_english.js"></script>
          <script src="js/wordlist_japanese.js"></script>
@@@ -942,6 -941,7 +942,7 @@@
          <script src="js/biginteger.js"></script>
          <script src="js/zxcvbn.js"></script>
          <script src="js/entropy.js"></script>
+         <script src="js/stellar-util.js"></script>
          <script src="js/index.js"></script>
      </body>
  </html>
diff --combined src/js/index.js
index 56f42d4,64075d3..599e8d1
--- a/src/js/index.js
+++ b/src/js/index.js
@@@ -931,6 -931,19 +931,19 @@@
                      privkey = ethUtil.addHexPrefix(privkey);
                      pubkey = ethUtil.addHexPrefix(pubkey);
                  }
+ 
+                 // Stellar is different
+                 if (networks[DOM.network.val()].name == "XLM - Stellar") {
+                     var purpose = parseIntNoNaN(DOM.bip44purpose.val(), 44);
+                     var coin = parseIntNoNaN(DOM.bip44coin.val(), 0);
+                     var path = "m/";
+                         path += purpose + "'/";
+                         path += coin + "'/" + index + "'";
+                     var keypair = stellarUtil.getKeypair(path, seed);
+                     indexText = path;
+                     privkey = keypair.secret();
+                     pubkey = address = keypair.publicKey();
+                 }
                  if ((networks[DOM.network.val()].name == "NAS - Nebulas")) {
                      var NasAccount = require("nebulas-account");
                      var privKeyBuffer = keyPair.d.toBuffer(32);
@@@ -980,16 -993,10 +993,16 @@@
                          address = bitcoinjs.bitcoin.address.fromOutputScript(scriptpubkey, network)
                      }
                  }
 -                
 +
                  if ((networks[DOM.network.val()].name == "CRW - Crown")) {
                      address = bitcoinjs.bitcoin.networks.crown.toNewAddress(address);
                  }
 +
 +              if (networks[DOM.network.val()].name == "EOS - EOSIO") {
 +                    address = ""
 +                    pubkey = eosUtil.bufferToPublic(keyPair.getPublicKeyBuffer());
 +                    privkey = eosUtil.bufferToPrivate(keyPair.d.toBuffer(32));
 +                }
                  
                  addAddressToList(indexText, address, pubkey, privkey);
                  if (isLast) {
@@@ -1965,13 -1972,6 +1978,13 @@@
                  setHdCoin(3);
              },
          },
 +        {
 +            name: "DOGEt - Dogecoin Testnet",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.dogecointestnet;
 +                setHdCoin(1);
 +            },
 +        },
          {
              name: "DXN - DEXON",
              onSelect: function() {
@@@ -2022,13 -2022,6 +2035,13 @@@
                  setHdCoin(151);
              },
          },
 +        {
 +            name: "EOS - EOSIO",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.bitcoin;
 +                setHdCoin(194);
 +            },
 +        },
          {
              name: "ESN - Ethersocial Network",
              segwitAvailable: false,
@@@ -2232,14 -2225,6 +2245,14 @@@
                  DOM.litecoinLtubContainer.removeClass("hidden");
              },
          },
 +        {
 +            name: "LTCt - Litecoin Testnet",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.litecointestnet;
 +                setHdCoin(1);
 +                DOM.litecoinLtubContainer.removeClass("hidden");
 +            },
 +        },
          {
              name: "LTZ - LitecoinZ",
              onSelect: function() {
@@@ -2396,13 -2381,6 +2409,13 @@@
                  setHdCoin(200);
              },
          },
 +        {
 +            name: "ONION - DeepOnion",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.deeponion;
 +                setHdCoin(305);
 +            },
 +        },
          {
              name: "ONX - Onixcoin",
              onSelect: function() {
@@@ -2713,6 -2691,13 +2726,13 @@@
                  setHdCoin(65);
              },
          },
+         {
+             name: "XLM - Stellar",
+             onSelect: function() {
+                 network = stellarUtil.dummyNetwork;
+                 setHdCoin(148);
+             },
+         },
          {
              name: "XMY - Myriadcoin",
              onSelect: function() {
@@@ -2784,13 -2769,6 +2804,13 @@@
                  setHdCoin(121);
              },
          },
 +        {
 +            name: "MONK - Monkey Project",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.monkey;
 +                setHdCoin(214);
 +            },
 +        }
      ]
  
      var clients = [