Merge branch 'master' into master

diff --git a/src/js/bitcoinjs-extensions.js b/src/js/bitcoinjs-extensions.js
index d1073aad0f346c1be51f67f2c9ea6bcc19e5d32f..5ba584ea040cb477cee5ba4ea80d7872c3295c31 100644 (file)
--- a/src/js/bitcoinjs-extensions.js
+++ b/src/js/bitcoinjs-extensions.js
@@ -1441,3 +1441,25 @@ bitcoinjs.bitcoin.networks.phore = {
   scriptHash: 0x0D,
   wif:  0xD4,
 };
+
+bitcoinjs.bitcoin.networks.blocknode = {
+  messagePrefix: '\x18Blocknode Signed Message:\n',
+  bip32: {
+       public: 0x0488b21e,
+       private: 0x0488ade4
+  },
+  pubKeyHash: 0x19,
+  scriptHash: 0x3F,
+  wif:  0x4b,
+};
+
+bitcoinjs.bitcoin.networks.blocknode_testnet = {
+  messagePrefix: '\x18Blocknode Testnet Signed Message:\n',
+  bip32: {
+       public: 0x043587cf,
+       private: 0x04358394
+  },
+  pubKeyHash: 0x55,
+  scriptHash: 0x7d,
+  wif:  0x89,
+};
\ No newline at end of file

diff --git a/src/js/index.js b/src/js/index.js
index 6b292f53095f80ebf56a63fba07c74fa7a911233..83221154ab90543c487aa3e00de51baf6e549891 100644 (file)
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -1702,6 +1702,20 @@
                 setHdCoin(10);
             },
         },
+        {
+            name: "BND - Blocknode",
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.blocknode;
+                setHdCoin(2941);
+            },
+        },     
+               {
+            name: "tBND - Blocknode Testnet",
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.blocknode_testnet;
+                setHdCoin(1);
+            },
+        },
         {
             name: "BRIT - Britcoin",
             onSelect: function() {

diff --git a/src/js/segwit-parameters.js b/src/js/segwit-parameters.js
index dbb7572f692bbf728ab237097d5e2e2f04311528..8a3557eb7f46cac3459097d2e93a0555b18e101b 100644 (file)
--- a/src/js/segwit-parameters.js
+++ b/src/js/segwit-parameters.js
@@ -183,5 +183,30 @@ bitcoinjs.bitcoin.networks.digibyte.p2wpkhInP2sh = {
     pubKeyHash: 0x1e,
     scriptHash: 0x3f,
     wif: 0x80
+};
+    bitcoinjs.bitcoin.networks.deimos.p2wpkh = {
+    baseNetwork: "deimos",
+    messagePrefix: '\x18Deimos Signed Message:\n',
+    bech32: 'dei',
+    bip32: {
+        public: 0x0488B21E,
+        private: 0x0488ADE4
+    },
+    pubKeyHash: 0x1f,
+    scriptHash: 0x21,
+    wif: 0x8a
+};
+
+bitcoinjs.bitcoin.networks.deimos.p2wpkhInP2sh = {
+    baseNetwork: "deimos",     
+    messagePrefix: '\x18Deimos Signed Message:\n',
+    bech32: 'dei',
+    bip32: {
+        public: 0x0488B21E,
+        private: 0x0488ADE4
+    },
+    pubKeyHash: 0x1f,
+    scriptHash: 0x21,
+    wif: 0x8a
 };
 })();

diff --git a/tests/spec/tests.js b/tests/spec/tests.js
index 58662fd86abc5d34002ffb78d648c1bb06b073da..0bb56f8ac6affee7b49ddcd9ca4f157a140eae73 100644 (file)
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@ -1362,7 +1362,21 @@ it('Allows selection of Safecoin', function(done) {
      };
      testNetwork(done, params);
  });
-    
+it('Allows selection of Blocknode', function(done) {
+    var params = {
+        selectText: "BND - Blocknode",
+        firstAddress: "BG8xZSAur2jYLG9VXt8dYfkKxxeR7w9bSe",
+    };
+    testNetwork(done, params);
+});
+it('Allows selection of Blocknode Testnet', function(done) {
+    var params = {
+        selectText: "tBND - Blocknode Testnet",
+        firstAddress: "bSptsFyDktFSKpWveRywJsDoJA2TC6qfHv",
+    };
+    testNetwork(done, params);
+});
+
 // BIP39 seed is set from phrase
 it('Sets the bip39 seed from the prhase', function(done) {
     driver.findElement(By.css('.phrase'))