From: iancoleman <1281387+iancoleman@users.noreply.github.com> Date: Tue, 4 Dec 2018 21:36:51 +0000 (+1100) Subject: Merge branch 'master' into master X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git;a=commitdiff_plain;h=acf4c9b588c6abcc275b4e46df54248a2c913366;hp=10cf809e7cb3f61927d6d1313072a0323d62d6db Merge branch 'master' into master --- diff --git a/src/js/bitcoinjs-extensions.js b/src/js/bitcoinjs-extensions.js index bd96e05..5ba584e 100644 --- a/src/js/bitcoinjs-extensions.js +++ b/src/js/bitcoinjs-extensions.js @@ -1067,6 +1067,17 @@ bitcoinjs.bitcoin.networks.rubycoin = { wif: 0xbc, }; +bitcoinjs.bitcoin.networks.safecoin = { + messagePrefix: '\x18Safecoin Signed Message:\n', + bip32: { + public: 0x0488b21e, + private: 0x0488ade4, + }, + pubKeyHash: 0x3d, + scriptHash: 0x56, + wif: 0xbd, +}; + bitcoinjs.bitcoin.networks.salus = { messagePrefix: '\x18Salus Signed Message:\n', bip32: { diff --git a/src/js/index.js b/src/js/index.js index 0dd23f3..8322115 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -2392,6 +2392,13 @@ }, }, { + name: "SAFE - Safecoin", + onSelect: function() { + network = bitcoinjs.bitcoin.networks.safecoin; + setHdCoin(19165); + }, + }, + { name: "SLS - Salus", onSelect: function() { network = bitcoinjs.bitcoin.networks.salus; diff --git a/tests/spec/tests.js b/tests/spec/tests.js index cd3f381..0bb56f8 100644 --- a/tests/spec/tests.js +++ b/tests/spec/tests.js @@ -1355,6 +1355,13 @@ it('Allows selection of Phore', function(done) { }; testNetwork(done, params); }); +it('Allows selection of Safecoin', function(done) { + var params = { + selectText: "SAFE - Safecoin", + firstAddress: "RmV56kPW7jeCmDA8sukHwbR7RZSbg9NFNF", + }; + testNetwork(done, params); + }); it('Allows selection of Blocknode', function(done) { var params = { selectText: "BND - Blocknode",