Merge pull request #216 from Coinomi/ethereum-like

Add ETC, PIRL, CLO, MIX, MUSIC, POA, EXP, and coinomi/ledger client o…

diff --combined src/js/index.js
index bfab5cf45e9bcb7c64ac6575ae2ca573622c5fb4,371cea9285d2b053cb1630b2d5a13792691827b5..589ba20fd891d612a0ad41bef636c45f96b23533
--- 1/src/js/index.js
--- 2/src/js/index.js
+++ b/src/js/index.js
@@@ -910,7 -910,14 +910,14 @@@
                      indexText = indexText + "'";
                  }
                  // Ethereum values are different
-                 if (networks[DOM.network.val()].name == "ETH - Ethereum") {
+                 if ((networks[DOM.network.val()].name == "ETH - Ethereum")
+                     || (networks[DOM.network.val()].name == "ETC - Ethereum Classic")
+                     || (networks[DOM.network.val()].name == "PIRL - Pirl")
+                     || (networks[DOM.network.val()].name == "MIX - MIX")
+                     || (networks[DOM.network.val()].name == "MUSIC - Musicoin")
+                     || (networks[DOM.network.val()].name == "POA - Poa")
+                     || (networks[DOM.network.val()].name == "EXP - Expanse")
+                     || (networks[DOM.network.val()].name == "CLO - Callisto")) {
                      var privKeyBuffer = keyPair.d.toBuffer(32);
                      privkey = privKeyBuffer.toString('hex');
                      var addressBuffer = ethUtil.privateToAddress(privKeyBuffer);
@@@ -1772,6 -1779,14 +1779,14 @@@
                  setHdCoin(23);
              },
          },
+         {
+             name: "CLO - Callisto",
+             segwitAvailable: false,
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.bitcoin;
+                 setHdCoin(820);
+             },
+         },
          {
              name: "CLUB - Clubcoin",
              onSelect: function() {
@@@ -1891,6 -1906,14 +1906,14 @@@
                  setHdCoin(151);
              },
          },
+         {
+             name: "ETC - Ethereum Classic",
+             segwitAvailable: false,
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.bitcoin;
+                 setHdCoin(61);
+             },
+         },
          {
              name: "ETH - Ethereum",
              onSelect: function() {
@@@ -1905,6 -1928,14 +1928,14 @@@
                  setHdCoin(190);
              },
          },
+         {
+             name: "EXP - Expanse",
+             segwitAvailable: false,
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.bitcoin;
+                 setHdCoin(40);
+             },
+         },
          {
              name: "FJC - Fujicoin",
              onSelect: function() {
@@@ -1967,13 -1998,6 +1998,13 @@@
                  network = bitcoinjs.bitcoin.networks.helleniccoin;
                  setHdCoin(168);
              },
 +        },
 +              {
 +            name: "HUSH - Hush",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.hush;
 +                setHdCoin(197);
 +            },
          },
          {
              name: "INSN - Insane",
@@@ -2069,6 -2093,14 +2100,14 @@@
                  setHdCoin(13);
              },
          },
+         {
+             name: "MIX - MIX",
+             segwitAvailable: false,
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.bitcoin;
+                 setHdCoin(76);
+             },
+         },
          {
              name: "MNX - Minexcoin",
              onSelect: function() {
@@@ -2083,6 -2115,14 +2122,14 @@@
                  setHdCoin(22);
              },
          },
+         {
+             name: "MUSIC - Musicoin",
+             segwitAvailable: false,
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.bitcoin;
+                 setHdCoin(184);
+             },
+         },
          {
              name: "NAV - Navcoin",
              onSelect: function() {
@@@ -2181,6 -2221,14 +2228,14 @@@
                  setHdCoin(117);
              },
          },
+         {
+             name: "PIRL - Pirl",
+             segwitAvailable: false,
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.bitcoin;
+                 setHdCoin(164);
+             },
+         },
          {
              name: "PIVX - PIVX",
              onSelect: function() {
@@@ -2195,6 -2243,14 +2250,14 @@@
                  setHdCoin(1);
              },
          },
+         {
+             name: "POA - Poa",
+             segwitAvailable: false,
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.bitcoin;
+                 setHdCoin(178);
+             },
+         },
          {
              name: "POSW - POSWcoin",
              onSelect: function() {
@@@ -2300,13 -2356,6 +2363,13 @@@
                  setHdCoin(105);
              },
          },
 +        {
 +            name: "TSTRAT - Stratis Testnet",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.stratistest;
 +                setHdCoin(105);
 +            },
 +        },
          {
              name: "SYS - Syscoin",
              onSelect: function() {
@@@ -2426,6 -2475,14 +2489,14 @@@
                  setHdCoin(77);
              },
          },
+         {
+             name: "XUEZ - Xuez",
+             segwitAvailable: false,
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.xuez;
+                 setHdCoin(225);
+             },
+         },
          {
              name: "XWC - Whitecoin",
              onSelect: function() {
@@@ -2454,13 -2511,6 +2525,6 @@@
                  setHdCoin(133);
              },
          },
-         {
-             name: "XUEZ - Xuez",
-             onSelect: function() {
-                 network = bitcoinjs.bitcoin.networks.xuez;
-                 setHdCoin(225);
-             },
-         },
          {
              name: "ZEN - Zencash",
              onSelect: function() {
@@@ -2491,6 -2541,13 +2555,13 @@@
                  DOM.bip32path.val("m/0'/0");
                  DOM.hardenedAddresses.prop('checked', false);
              },
+         },
+         {
+             name: "Coinomi, Ledger",
+             onSelect: function() {
+                 DOM.bip32path.val("m/44'/"+DOM.bip44coin.val()+"'/0'");
+                 DOM.hardenedAddresses.prop('checked', false);
+             },
          }
      ]
  

diff --combined tests/spec/tests.js
index c97c9734cb0364053a12a3198d558a6c60e17342,0ffc73bd8d7d96ae2b43bc512fbeac228f2e7286..ddb909a6d67b2b7d6bf4152478f35294fe1f13ad
--- 1/tests/spec/tests.js
--- 2/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@@ -1096,13 -1096,6 +1096,13 @@@ it('Allows selection of Stratis', funct
      };
      testNetwork(done, params);
  });
 +it('Allows selection of Stratis Test', function(done) {
 +    var params = {
 +        selectText: "TSTRAT - Stratis Testnet",
 +        firstAddress: "TRLWm3dye4FRrDWouwYUSUZP96xb76mBE3",
 +    };
 +    testNetwork(done, params);
 +});
  it('Allows selection of Syscoin', function(done) {
      var params = {
          selectText: "SYS - Syscoin",
@@@ -1215,6 -1208,55 +1215,55 @@@ it('Allows selection of Energi', functi
      };
      testNetwork(done, params);
  });
+ it('Allows selection of Ethereum Classic', function(done) {
+     var params = {
+         selectText: "ETC - Ethereum Classic",
+         firstAddress: "0x3c05e5556693808367afB62eF3b63e35d6eD249A",
+     };
+     testNetwork(done, params);
+ });
+ it('Allows selection of Pirl', function(done) {
+     var params = {
+         selectText: "PIRL - Pirl",
+         firstAddress: "0xe77FC0723dA122B5025CA79193c28563eB47e776",
+     };
+     testNetwork(done, params);
+ });
+ it('Allows selection of MIX', function(done) {
+     var params = {
+         selectText: "MIX - MIX",
+         firstAddress: "0x98BC5e63aeb6A4e82d72850d20710F07E29A29F1",
+     };
+     testNetwork(done, params);
+ });
+ it('Allows selection of Musicoin', function(done) {
+     var params = {
+         selectText: "MUSIC - Musicoin",
+         firstAddress: "0xDc060e4A0b0313ea83Cf6B3A39B9db2D29004897",
+     };
+     testNetwork(done, params);
+ });
+ it('Allows selection of Poa', function(done) {
+     var params = {
+         selectText: "POA - Poa",
+         firstAddress: "0x53aF28d754e106210C3d0467Dd581eaf7e3C5e60",
+     };
+     testNetwork(done, params);
+ });
+ it('Allows selection of Expanse', function(done) {
+     var params = {
+         selectText: "EXP - Expanse",
+         firstAddress: "0xf57FeAbf26582b6E3E666559d3B1Cc6fB2b2c5F6",
+     };
+     testNetwork(done, params);
+ });
+ it('Allows selection of Callisto', function(done) {
+     var params = {
+         selectText: "CLO - Callisto",
+         firstAddress: "0x4f9364F7420B317266C51Dc8eB979717D4dE3f4E",
+     };
+     testNetwork(done, params);
+ });
  
  
  // BIP39 seed is set from phrase