From: iancoleman <1281387+iancoleman@users.noreply.github.com> Date: Thu, 12 Sep 2019 00:36:30 +0000 (+1000) Subject: Merge pull request #352 from PavlosTze/bsv-rpd-monkey-arya X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git;a=commitdiff_plain;h=c6c86591a9c87cc85e12c8ee6591099b0f502070;hp=31264e8bea7a8c9f693979ac2401c5ca7b8ce59e Merge pull request #352 from PavlosTze/bsv-rpd-monkey-arya Support BSV, RPD, MONKEY, ARYA --- 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 = { 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 b3450d3..fff1e40 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -2199,11 +2199,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", @@ -2888,7 +2895,7 @@ }, }, { - name: "ZEN - Zencash", + name: "ZEN - Horizen", onSelect: function() { network = bitcoinjs.bitcoin.networks.zencash; 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) { }; testNetwork(done, params); }); -it('Allows selection of Zencash', function(done) { +it('Allows selection of Horizen', function(done) { var params = { - selectText: "ZEN - Zencash", + selectText: "ZEN - Horizen", firstAddress: "znWh9XASyW2dZq5tck84wFjiwuqVysi7q3p", }; testNetwork(done, params); @@ -1470,11 +1470,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",