X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2Fjs%2Findex.js;h=ad2b8597c13b5945b68e10a5fa87b61105752bb3;hb=b64fb35301060c00acaf25beec37971d1877d0cd;hp=d843ee1cd828c387ad0bbbad1b51ea23621e8bf0;hpb=22f8766947313324c4acda2de4f170475d3c5ded;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git

diff --git a/src/js/index.js b/src/js/index.js
index d843ee1..ad2b859 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -1128,14 +1128,16 @@
                 }
                 // Ethereum values are different
                 if (networkIsEthereum()) {
-                    var privKeyBuffer = keyPair.d.toBuffer(32);
-                    privkey = privKeyBuffer.toString('hex');
-                    var addressBuffer = libs.ethUtil.privateToAddress(privKeyBuffer);
+                    var pubkeyBuffer = keyPair.getPublicKeyBuffer();
+                    var ethPubkey = libs.ethUtil.importPublic(pubkeyBuffer);
+                    var addressBuffer = libs.ethUtil.publicToAddress(ethPubkey);
                     var hexAddress = addressBuffer.toString('hex');
                     var checksumAddress = libs.ethUtil.toChecksumAddress(hexAddress);
                     address = libs.ethUtil.addHexPrefix(checksumAddress);
-                    privkey = libs.ethUtil.addHexPrefix(privkey);
                     pubkey = libs.ethUtil.addHexPrefix(pubkey);
+                    if (hasPrivkey) {
+                        privkey = libs.ethUtil.bufferToHex(keyPair.d.toBuffer());
+                    }
                 }
 
                 // Stellar is different
@@ -1163,6 +1165,11 @@
                     privkey = convertRipplePriv(privkey);
                     address = convertRippleAdrr(address);
                 }
+                // Jingtum values are different
+                if (networks[DOM.network.val()].name == "SWTC - Jingtum") {
+                    privkey = convertJingtumPriv(privkey);
+                    address = convertJingtumAdrr(address);
+                }
                 // CasinoCoin values are different
                 if (networks[DOM.network.val()].name == "CSC - CasinoCoin") {
                     privkey = convertCasinoCoinPriv(privkey);
@@ -1830,6 +1837,7 @@
                     || (name == "EWT - EnergyWeb")
                     || (name == "PIRL - Pirl")
                     || (name == "MIX - MIX")
+                    || (name == "MOAC - MOAC")
                     || (name == "MUSIC - Musicoin")
                     || (name == "POA - Poa")
                     || (name == "EXP - Expanse")
@@ -1838,6 +1846,7 @@
                     || (name == "ELLA - Ellaism")
                     || (name == "ESN - Ethersocial Network")
                     || (name == "VET - VeChain")
+                    || (name == "ERE - EtherCore")
     }
 
     function networkHasSegwit() {
@@ -2417,6 +2426,14 @@
                 setHdCoin(194);
             },
         },
+        {
+            name: "ERE - EtherCore",
+            segwitAvailable: false,
+            onSelect: function() {
+                network = libs.bitcoin.networks.bitcoin;
+                setHdCoin(466);
+            },
+        },
         {
             name: "ESN - Ethersocial Network",
             segwitAvailable: false,
@@ -2727,6 +2744,14 @@
                 setHdCoin(214);
             },
         },
+        {
+            name: "MOAC - MOAC",
+            segwitAvailable: false,
+            onSelect: function() {
+                network = libs.bitcoin.networks.bitcoin;
+                setHdCoin(314);
+            },
+        },
         {
             name: "MUSIC - Musicoin",
             segwitAvailable: false,
@@ -2947,6 +2972,20 @@
                 setHdCoin(175);
             },
         },
+        {
+            name: "R-BTC - RSK",
+            onSelect: function() {
+                network = libs.bitcoin.networks.rsk;
+                setHdCoin(137);
+            },
+        },
+        {
+            name: "tR-BTC - RSK Testnet",
+            onSelect: function() {
+                network = libs.bitcoin.networks.rsktestnet;
+                setHdCoin(37310);
+            },
+        },
         {
             name: "RBY - Rubycoin",
             onSelect: function() {
@@ -3052,6 +3091,13 @@
                 setHdCoin(105);
             },
         },
+        {
+            name: "SWTC - Jingtum",
+            onSelect: function() {
+                network = libs.bitcoin.networks.bitcoin;
+                setHdCoin(315);
+            },
+        },
         {
             name: "TSTRAT - Stratis Testnet",
             onSelect: function() {