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;hp=9369eaa6d56500061c952927691e31cd503ae11c

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

diff --git a/src/js/index.js b/src/js/index.js
index 1b56d6c..371cea9 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -910,7 +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 @@
                 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 @@
                 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 @@
                 setHdCoin(190);
             },
         },
+        {
+            name: "EXP - Expanse",
+            segwitAvailable: false,
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.bitcoin;
+                setHdCoin(40);
+            },
+        },
         {
             name: "FJC - Fujicoin",
             onSelect: function() {
@@ -2062,6 +2093,14 @@
                 setHdCoin(13);
             },
         },
+        {
+            name: "MIX - MIX",
+            segwitAvailable: false,
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.bitcoin;
+                setHdCoin(76);
+            },
+        },
         {
             name: "MNX - Minexcoin",
             onSelect: function() {
@@ -2076,6 +2115,14 @@
                 setHdCoin(22);
             },
         },
+        {
+            name: "MUSIC - Musicoin",
+            segwitAvailable: false,
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.bitcoin;
+                setHdCoin(184);
+            },
+        },
         {
             name: "NAV - Navcoin",
             onSelect: function() {
@@ -2174,6 +2221,14 @@
                 setHdCoin(117);
             },
         },
+        {
+            name: "PIRL - Pirl",
+            segwitAvailable: false,
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.bitcoin;
+                setHdCoin(164);
+            },
+        },
         {
             name: "PIVX - PIVX",
             onSelect: function() {
@@ -2188,6 +2243,14 @@
                 setHdCoin(1);
             },
         },
+        {
+            name: "POA - Poa",
+            segwitAvailable: false,
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.bitcoin;
+                setHdCoin(178);
+            },
+        },
         {
             name: "POSW - POSWcoin",
             onSelect: function() {
@@ -2412,6 +2475,14 @@
                 setHdCoin(77);
             },
         },
+        {
+            name: "XUEZ - Xuez",
+            segwitAvailable: false,
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.xuez;
+                setHdCoin(225);
+            },
+        },
         {
             name: "XWC - Whitecoin",
             onSelect: function() {
@@ -2440,13 +2511,6 @@
                 setHdCoin(133);
             },
         },
-        {
-            name: "XUEZ - Xuez",
-            onSelect: function() {
-                network = bitcoinjs.bitcoin.networks.xuez;
-                setHdCoin(225);
-            },
-        },
         {
             name: "ZEN - Zencash",
             onSelect: function() {
@@ -2477,6 +2541,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 --git a/tests/spec/tests.js b/tests/spec/tests.js
index b81294b..0ffc73b 100644
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@ -1208,6 +1208,55 @@ it('Allows selection of Energi', function(done) {
     };
     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