Merge branch 'master' into master

diff --git a/src/js/bitcoinjs-extensions.js b/src/js/bitcoinjs-extensions.js
index bd96e053235525eb58165fda826c87e5af69957e..5ba584ea040cb477cee5ba4ea80d7872c3295c31 100644 (file)
--- 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 0dd23f39460211fc5e6e0bcc4db4c06738ab358a..83221154ab90543c487aa3e00de51baf6e549891 100644 (file)
--- 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 cd3f381d1aba6284e049c12ebedc44984b88a1ef..0bb56f8ac6affee7b49ddcd9ca4f157a140eae73 100644 (file)
--- 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",