Merge pull request #355 from zhanghangorg/master

Zencash renamed Horizen

diff --git a/src/js/bitcoinjs-extensions.js b/src/js/bitcoinjs-extensions.js
index b37f58f5255302fb4bd4f2a199cc4fec58116fe3..1a286289331d7de24854f50716a6204bedd1e47c 100644 (file)
--- a/src/js/bitcoinjs-extensions.js
+++ b/src/js/bitcoinjs-extensions.js
@@ -1462,6 +1462,17 @@ bitcoinjs.bitcoin.networks.hush = {
   wif: 0x80,
 };
 
+bitcoinjs.bitcoin.networks.hush3 = {
+  messagePrefix: '\x18Hush Signed Message:\n',
+  bip32: {
+    public: 0x0488B21E,
+    private: 0x0488ADE4,
+  },
+  pubKeyHash: 0x3C,
+  scriptHash: 0x55,
+  wif: 0xBC,
+};
+
 bitcoinjs.bitcoin.networks.zclassic = {
   messagePrefix: '\x18Zcash Signed Message:\n',
   bip32: {

diff --git a/src/js/index.js b/src/js/index.js
index 035747cb0f89f2a415d90336292b5ce6d0e9bb11..deb88d4571d39dcab94a9bc93f1f1a9deebc4775 100644 (file)
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -2185,11 +2185,18 @@
             },
         },
                {
-            name: "HUSH - Hush",
+            name: "HUSH - Hush (Legacy)",
             onSelect: function() {
                 network = bitcoinjs.bitcoin.networks.hush;
                 setHdCoin(197);
             },
+        },
+               {
+            name: "HUSH - Hush3",
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.hush3;
+                setHdCoin(197);
+            },
         },
         {
             name: "INSN - Insane",

diff --git a/tests/spec/tests.js b/tests/spec/tests.js
index f2ca721ecd7256ba3d1248dc9106625837e1a87a..76f52971f06f601e5495206817be7aa42e8215ef 100644 (file)
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@ -1441,11 +1441,18 @@ it('Allows selection of Callisto', function(done) {
 });
 it('Allows selection of HUSH', function(done) {
     var params = {
-        selectText: "HUSH - Hush",
+        selectText: "HUSH - Hush (Legacy)",
         firstAddress: "t1g6rLXUnJaiJuu4q4zmJjoa9Gk4fwKpiuA",
     };
     testNetwork(done, params);
 });
+it('Allows selection of HUSH3', function(done) {
+    var params = {
+        selectText: "HUSH - Hush3",
+        firstAddress: "RXWSQhwvw5jHPGP8bjwJhWoRnMLBnuPDKD",
+    };
+    testNetwork(done, params);
+});
 it('Allows selection of ExchangeCoin', function(done) {
     var params = {
         selectText: "EXCC - ExchangeCoin",