aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/js/bitcoinjs-extensions.js11
-rw-r--r--src/js/index.js11
-rw-r--r--tests/spec/tests.js13
3 files changed, 30 insertions, 5 deletions
diff --git a/src/js/bitcoinjs-extensions.js b/src/js/bitcoinjs-extensions.js
index 0658ae7..ac9f315 100644
--- a/src/js/bitcoinjs-extensions.js
+++ b/src/js/bitcoinjs-extensions.js
@@ -1462,6 +1462,17 @@ bitcoinjs.bitcoin.networks.hush = {
1462 wif: 0x80, 1462 wif: 0x80,
1463}; 1463};
1464 1464
1465bitcoinjs.bitcoin.networks.hush3 = {
1466 messagePrefix: '\x18Hush Signed Message:\n',
1467 bip32: {
1468 public: 0x0488B21E,
1469 private: 0x0488ADE4,
1470 },
1471 pubKeyHash: 0x3C,
1472 scriptHash: 0x55,
1473 wif: 0xBC,
1474};
1475
1465bitcoinjs.bitcoin.networks.zclassic = { 1476bitcoinjs.bitcoin.networks.zclassic = {
1466 messagePrefix: '\x18Zcash Signed Message:\n', 1477 messagePrefix: '\x18Zcash Signed Message:\n',
1467 bip32: { 1478 bip32: {
diff --git a/src/js/index.js b/src/js/index.js
index b3450d3..fff1e40 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -2199,12 +2199,19 @@
2199 }, 2199 },
2200 }, 2200 },
2201 { 2201 {
2202 name: "HUSH - Hush", 2202 name: "HUSH - Hush (Legacy)",
2203 onSelect: function() { 2203 onSelect: function() {
2204 network = bitcoinjs.bitcoin.networks.hush; 2204 network = bitcoinjs.bitcoin.networks.hush;
2205 setHdCoin(197); 2205 setHdCoin(197);
2206 }, 2206 },
2207 }, 2207 },
2208 {
2209 name: "HUSH - Hush3",
2210 onSelect: function() {
2211 network = bitcoinjs.bitcoin.networks.hush3;
2212 setHdCoin(197);
2213 },
2214 },
2208 { 2215 {
2209 name: "INSN - Insane", 2216 name: "INSN - Insane",
2210 onSelect: function() { 2217 onSelect: function() {
@@ -2888,7 +2895,7 @@
2888 }, 2895 },
2889 }, 2896 },
2890 { 2897 {
2891 name: "ZEN - Zencash", 2898 name: "ZEN - Horizen",
2892 onSelect: function() { 2899 onSelect: function() {
2893 network = bitcoinjs.bitcoin.networks.zencash; 2900 network = bitcoinjs.bitcoin.networks.zencash;
2894 setHdCoin(121); 2901 setHdCoin(121);
diff --git a/tests/spec/tests.js b/tests/spec/tests.js
index 8b77b4a..0901311 100644
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@ -1397,9 +1397,9 @@ it('Allows selection of Zclassic', function(done) {
1397 }; 1397 };
1398 testNetwork(done, params); 1398 testNetwork(done, params);
1399}); 1399});
1400it('Allows selection of Zencash', function(done) { 1400it('Allows selection of Horizen', function(done) {
1401 var params = { 1401 var params = {
1402 selectText: "ZEN - Zencash", 1402 selectText: "ZEN - Horizen",
1403 firstAddress: "znWh9XASyW2dZq5tck84wFjiwuqVysi7q3p", 1403 firstAddress: "znWh9XASyW2dZq5tck84wFjiwuqVysi7q3p",
1404 }; 1404 };
1405 testNetwork(done, params); 1405 testNetwork(done, params);
@@ -1470,11 +1470,18 @@ it('Allows selection of Callisto', function(done) {
1470}); 1470});
1471it('Allows selection of HUSH', function(done) { 1471it('Allows selection of HUSH', function(done) {
1472 var params = { 1472 var params = {
1473 selectText: "HUSH - Hush", 1473 selectText: "HUSH - Hush (Legacy)",
1474 firstAddress: "t1g6rLXUnJaiJuu4q4zmJjoa9Gk4fwKpiuA", 1474 firstAddress: "t1g6rLXUnJaiJuu4q4zmJjoa9Gk4fwKpiuA",
1475 }; 1475 };
1476 testNetwork(done, params); 1476 testNetwork(done, params);
1477}); 1477});
1478it('Allows selection of HUSH3', function(done) {
1479 var params = {
1480 selectText: "HUSH - Hush3",
1481 firstAddress: "RXWSQhwvw5jHPGP8bjwJhWoRnMLBnuPDKD",
1482 };
1483 testNetwork(done, params);
1484});
1478it('Allows selection of ExchangeCoin', function(done) { 1485it('Allows selection of ExchangeCoin', function(done) {
1479 var params = { 1486 var params = {
1480 selectText: "EXCC - ExchangeCoin", 1487 selectText: "EXCC - ExchangeCoin",