Fix incorrect address generation for altcoins with bip38

[perso/Immae/Projets/Cryptomonnaies/BIP39.git] / src / js / index.js

diff --git a/src/js/index.js b/src/js/index.js
index 9d34563cf4e0cefdf880b23f278742e3c4326a4d..afa743dc924eb5cc35228e8b4f22c3093f085bb8 100644 (file)
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -813,7 +813,7 @@
                 var keyPair = key.keyPair;
                 var useUncompressed = useBip38;
                 if (useUncompressed) {
-                    keyPair = new bitcoinjs.bitcoin.ECPair(keyPair.d, null, { compressed: false });
+                    keyPair = new bitcoinjs.bitcoin.ECPair(keyPair.d, null, { network: network, compressed: false });
                 }
                 // get address
                 var address = keyPair.getAddress().toString();
@@ -821,7 +821,7 @@
                 var hasPrivkey = !key.isNeutered();
                 var privkey = "NA";
                 if (hasPrivkey) {
-                    privkey = keyPair.toWIF(network);
+                    privkey = keyPair.toWIF();
                     // BIP38 encode private key if required
                     if (useBip38) {
                         privkey = bitcoinjsBip38.encrypt(keyPair.d.toBuffer(), false, bip38password, function(p) {
@@ -1646,6 +1646,22 @@
                 setHdCoin(1);
             },
         },
+        {
+            name: "BTCP - Bitcoin Private",
+            segwitAvailable: true,
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.bitcoinprivate;
+                setHdCoin(183);
+            },
+        },
+        {
+            name: "BTCZ - Bitcoinz",
+            segwitAvailable: false,
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.bitcoinz;
+                setHdCoin(177);
+            },
+        },
         {
             name: "BTG - Bitcoin Gold",
             segwitAvailable: true,
@@ -2071,6 +2087,14 @@
                 setHdCoin(7);
             },
         },
+        {
+            name: "NRG - Energi",
+            segwitAvailable: false,
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.energi;
+                setHdCoin(204);
+            },
+        },
         {
             name: "NRO - Neurocoin",
             segwitAvailable: false,
@@ -2423,6 +2447,14 @@
                 setHdCoin(136);
             },
         },
+        {
+            name: "ZCL - Zclassic",
+            segwitAvailable: false,
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.zclassic;
+                setHdCoin(147);
+            },
+        },
         {
             name: "ZEC - Zcash",
             segwitAvailable: false,
@@ -2439,6 +2471,14 @@
                 setHdCoin(225);
             },
         },
+        {
+            name: "ZEN - Zencash",
+            segwitAvailable: false,
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.zencash;
+                setHdCoin(121);
+            },
+        },
     ]
 
     var clients = [