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

Merge pull request #339 from NewCapital/master

Adding support for TWINS and FIX coins
---

6c733477dbaeb521b8b9d25004ee01b74af1529f
diff --combined src/js/index.js
index 599e8d1,b784f8c..8e6b106
--- a/src/js/index.js
+++ b/src/js/index.js
@@@ -931,19 -931,6 +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);
@@@ -1003,7 -990,7 +1003,7 @@@
                      pubkey = eosUtil.bufferToPublic(keyPair.getPublicKeyBuffer());
                      privkey = eosUtil.bufferToPrivate(keyPair.d.toBuffer(32));
                  }
-                 
+ 
                  addAddressToList(indexText, address, pubkey, privkey);
                  if (isLast) {
                      hidePending();
@@@ -2087,6 -2074,20 +2087,20 @@@
                  setHdCoin(40);
              },
          },
+         {
+             name: "FIX - FIX",
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.fix;
+                 setHdCoin(336);
+             },
+         },
+         {
+             name: "FIX - FIX Testnet",
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.fixtestnet;
+                 setHdCoin(1);
+             },
+         },
          {
              name: "FJC - Fujicoin",
              onSelect: function() {
@@@ -2649,6 -2650,20 +2663,20 @@@
                  setHdCoin(159);
              },
          },
+         {
+             name: "TWINS - TWINS",
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.twins;
+                 setHdCoin(970);
+             },
+         },
+         {
+             name: "TWINS - TWINS Testnet",
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.twinstestnet;
+                 setHdCoin(1);
+             },
+         },
          {
              name: "USC - Ultimatesecurecash",
              onSelect: function() {
@@@ -2726,13 -2741,6 +2754,13 @@@
                  setHdCoin(65);
              },
          },
 +        {
 +            name: "XLM - Stellar",
 +            onSelect: function() {
 +                network = stellarUtil.dummyNetwork;
 +                setHdCoin(148);
 +            },
 +        },
          {
              name: "XMY - Myriadcoin",
              onSelect: function() {