From: xarakas <harilakas@gmail.com>
Date: Mon, 18 Jun 2018 14:17:49 +0000 (+0300)
Subject: Merge branch 'master' into ethereum-like
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git;a=commitdiff_plain;h=0f1cfea04ce101cd42213e621e41e17c3063f3d2

Merge branch 'master' into ethereum-like
---

0f1cfea04ce101cd42213e621e41e17c3063f3d2
diff --cc src/js/index.js
index 7d04a05,1b56d6c..371cea9
--- a/src/js/index.js
+++ b/src/js/index.js
@@@ -1709,17 -1772,8 +1779,16 @@@
                  setHdCoin(23);
              },
          },
 +        {
 +            name: "CLO - Callisto",
 +            segwitAvailable: false,
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.bitcoin;
 +                setHdCoin(820);
 +            },
 +        },
          {
              name: "CLUB - Clubcoin",
-             segwitAvailable: false,
              onSelect: function() {
                  network = bitcoinjs.bitcoin.networks.clubcoin;
                  setHdCoin(79);
@@@ -1853,17 -1891,8 +1906,16 @@@
                  setHdCoin(151);
              },
          },
 +        {
 +            name: "ETC - Ethereum Classic",
 +            segwitAvailable: false,
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.bitcoin;
 +                setHdCoin(61);
 +            },
 +        },
          {
              name: "ETH - Ethereum",
-             segwitAvailable: false,
              onSelect: function() {
                  network = bitcoinjs.bitcoin.networks.bitcoin;
                  setHdCoin(60);
@@@ -1877,17 -1905,8 +1928,16 @@@
                  setHdCoin(190);
              },
          },
 +        {
 +            name: "EXP - Expanse",
 +            segwitAvailable: false,
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.bitcoin;
 +                setHdCoin(40);
 +            },
 +        },
          {
              name: "FJC - Fujicoin",
-             segwitAvailable: true,
              onSelect: function() {
                  network = bitcoinjs.bitcoin.networks.fujicoin;
                  setHdCoin(75);
@@@ -2062,17 -2062,8 +2093,16 @@@
                  setHdCoin(13);
              },
          },
 +        {
 +            name: "MIX - MIX",
 +            segwitAvailable: false,
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.bitcoin;
 +                setHdCoin(76);
 +            },
 +        },
          {
              name: "MNX - Minexcoin",
-             segwitAvailable: true,
              onSelect: function() {
                  network = bitcoinjs.bitcoin.networks.minexcoin;
                  setHdCoin(182);
@@@ -2086,17 -2076,8 +2115,16 @@@
                  setHdCoin(22);
              },
          },
 +        {
 +            name: "MUSIC - Musicoin",
 +            segwitAvailable: false,
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.bitcoin;
 +                setHdCoin(184);
 +            },
 +        },
          {
              name: "NAV - Navcoin",
-             segwitAvailable: true,
              onSelect: function() {
                  network = bitcoinjs.bitcoin.networks.navcoin;
                  setHdCoin(130);
@@@ -2206,17 -2174,8 +2221,16 @@@
                  setHdCoin(117);
              },
          },
 +        {
 +            name: "PIRL - Pirl",
 +            segwitAvailable: false,
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.bitcoin;
 +                setHdCoin(164);
 +            },
 +        },
          {
              name: "PIVX - PIVX",
-             segwitAvailable: false,
              onSelect: function() {
                  network = bitcoinjs.bitcoin.networks.pivx;
                  setHdCoin(119);
@@@ -2230,17 -2188,8 +2243,16 @@@
                  setHdCoin(1);
              },
          },
 +        {
 +            name: "POA - Poa",
 +            segwitAvailable: false,
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.bitcoin;
 +                setHdCoin(178);
 +            },
 +        },
          {
              name: "POSW - POSWcoin",
-             segwitAvailable: false,
              onSelect: function() {
                  network = bitcoinjs.bitcoin.networks.poswcoin;
                  setHdCoin(47);
@@@ -2494,17 -2412,8 +2475,16 @@@
                  setHdCoin(77);
              },
          },
 +        {
 +            name: "XUEZ - Xuez",
 +            segwitAvailable: false,
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.xuez;
 +                setHdCoin(225);
 +            },
 +        },
          {
              name: "XWC - Whitecoin",
-             segwitAvailable: false,
              onSelect: function() {
                  network = bitcoinjs.bitcoin.networks.whitecoin;
                  setHdCoin(155);
@@@ -2534,9 -2440,15 +2511,8 @@@
                  setHdCoin(133);
              },
          },
 -        {
 -            name: "XUEZ - Xuez",
 -            onSelect: function() {
 -                network = bitcoinjs.bitcoin.networks.xuez;
 -                setHdCoin(225);
 -            },
 -        },
          {
              name: "ZEN - Zencash",
-             segwitAvailable: false,
              onSelect: function() {
                  network = bitcoinjs.bitcoin.networks.zencash;
                  setHdCoin(121);