Merge pull request #456 from r1979/master

Updated Zcoin (XZC) Due to its rebrand fo Firo (FIRO)

diff --git a/src/js/bitcoinjs-extensions.js b/src/js/bitcoinjs-extensions.js
index 8f50f11f4c83067424e9128bafdff2968eb063b9..37cc0c6fd6946ff5ea888be17ddc1aadee94f7f6 100644 (file)
--- a/src/js/bitcoinjs-extensions.js
+++ b/src/js/bitcoinjs-extensions.js
@@ -768,6 +768,17 @@ libs.bitcoin.networks.feathercoin = {
   wif: 0x8e,
 };
 
+libs.bitcoin.networks.firo = {
+  messagePrefix: '\x18Firo Signed Message:\n',
+  bip32: {
+    public: 0x0488B21E,
+    private: 0x0488ADE4,
+  },
+  pubKeyHash: 0x52,
+  scriptHash: 0x07,
+  wif: 0xd2,
+};
+
 libs.bitcoin.networks.firstcoin = {
   messagePrefix: '\x18FirstCoin Signed Message:\n',
   bip32: {
@@ -1465,17 +1476,6 @@ libs.bitcoin.networks.wincoin = {
   wif: 0xc9,
 };
 
-libs.bitcoin.networks.zcoin = {
-  messagePrefix: '\x18Zcoin Signed Message:\n',
-  bip32: {
-    public: 0x0488B21E,
-    private: 0x0488ADE4,
-  },
-  pubKeyHash: 0x52,
-  scriptHash: 0x07,
-  wif: 0xd2,
-};
-
 libs.bitcoin.networks.zcash = {
   messagePrefix: '\x18Zcash Signed Message:\n',
   bip32: {

diff --git a/src/js/index.js b/src/js/index.js
index 7aa021704f633ea44448aaeece1870b23a22d6fd..0412b9b35c9adae5f0201d1d12c0bad0de61e5d5 100644 (file)
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -2684,6 +2684,13 @@
                 setHdCoin(235);
             },
         },  
+        {
+            name: "FIRO - Firo",
+            onSelect: function() {
+                network = libs.bitcoin.networks.firo;
+                setHdCoin(136);
+            },
+        },
         {
             name: "FIX - FIX",
             onSelect: function() {
@@ -3526,13 +3533,6 @@
                 setHdCoin(155);
             },
         },
-        {
-            name: "XZC - Zcoin",
-            onSelect: function() {
-                network = libs.bitcoin.networks.zcoin;
-                setHdCoin(136);
-            },
-        },
         {
             name: "ZCL - Zclassic",
             onSelect: function() {

diff --git a/tests/spec/tests.js b/tests/spec/tests.js
index 9d07edb46f5e244bd996fd3b1ca912644c486aef..c4f318866228aa2397874ad1e607e0a6d8ad2c62 100644 (file)
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@ -1214,6 +1214,16 @@ it('Allows selection of FIO', function(done) {
     };
     testNetwork(done, params);
 });
+it('Allows selection of Firo', function(done) {
+    var params = {
+        selectText: "FIRO - Firo",
+        phrase: "abandon abandon ability",
+        firstAddress: "a6VcMdP4XgAA9Tr7xNszmPG5FZpfRf17Cq",
+        firstPubKey: "0236f2348c32dc62d69488b01988ed1154df261723ec60461cb6e62189984c62db",
+        firstPrivKey: "Y8k3XQRQrJoABEao4Sw45s744g6xth7yviNqFcN7zqPqKUJrrKTQ",
+    };
+    testNetwork(done, params);
+});
 it('Allows selection of Firstcoin', function(done) {
     var params = {
         selectText: "FRST - Firstcoin",
@@ -1844,16 +1854,6 @@ it('Allows selection of Wincoin', function(done) {
     };
     testNetwork(done, params);
 });
-it('Allows selection of Zcoin', function(done) {
-    var params = {
-        selectText: "XZC - Zcoin",
-        phrase: "abandon abandon ability",
-        firstAddress: "a6VcMdP4XgAA9Tr7xNszmPG5FZpfRf17Cq",
-        firstPubKey: "0236f2348c32dc62d69488b01988ed1154df261723ec60461cb6e62189984c62db",
-        firstPrivKey: "Y8k3XQRQrJoABEao4Sw45s744g6xth7yviNqFcN7zqPqKUJrrKTQ",
-    };
-    testNetwork(done, params);
-});
 it('Allows selection of Zcash', function(done) {
     var params = {
         selectText: "ZEC - Zcash",