From: iancoleman <1281387+iancoleman@users.noreply.github.com>
Date: Wed, 21 Nov 2018 10:46:06 +0000 (+1100)
Subject: Merge pull request #273 from CCob/master
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git;a=commitdiff_plain;h=20d077e3afb0f34f437f033aaf016df0076b2bec;hp=-c

Merge pull request #273 from CCob/master

Added support for Blocknode
---

20d077e3afb0f34f437f033aaf016df0076b2bec
diff --combined src/js/bitcoinjs-extensions.js
index 271dbce,4389969..bd96e05
--- a/src/js/bitcoinjs-extensions.js
+++ b/src/js/bitcoinjs-extensions.js
@@@ -1023,17 -1023,6 +1023,17 @@@ bitcoinjs.bitcoin.networks.putincoin = 
    wif: 0xb7,
  };
  
 +bitcoinjs.bitcoin.networks.ravencoin = {
 +  messagePrefix: '\x16Raven Signed Message:\n',
 +  bip32: {
 +    public: 0x0488B21E,
 +    private: 0x0488ADE4,
 +  },
 +  pubKeyHash: 0x3c,
 +  scriptHash: 0x7a,
 +  wif: 0x80,
 +};
 +
  bitcoinjs.bitcoin.networks.reddcoin = {
    messagePrefix: '\x18Reddcoin Signed Message:\n',
    bip32: {
@@@ -1429,4 -1418,26 +1429,26 @@@ bitcoinjs.bitcoin.networks.phore = 
    pubKeyHash: 0x37,
    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,
  };
diff --combined src/js/index.js
index de509e8,9d94765..0dd23f3
--- a/src/js/index.js
+++ b/src/js/index.js
@@@ -1702,6 -1702,20 +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() {
@@@ -2349,13 -2363,6 +2363,13 @@@
                  setHdCoin(122);
              },
          },
 +        {
 +            name: "RVN - Ravencoin",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.ravencoin;
 +                setHdCoin(175);
 +            },
 +        },
          {
              name: "RBY - Rubycoin",
              onSelect: function() {
diff --combined tests/spec/tests.js
index 56c259c,6f9d693..cd3f381
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@@ -1065,13 -1065,6 +1065,13 @@@ it('Allows selection of Putincoin', fun
      var params = {
          selectText: "PUT - Putincoin",
          firstAddress: "PViWnfr2uFtovd6e7joM49C94CsGSnqJis",
 +    };
 +    testNetwork(done, params);
 +});
 +it('Allows selection of Ravencoin', function(done) {
 +    var params = {
 +        selectText: "RVN - Ravencoin",
 +        firstAddress: "RBuDoVNnzvFsEcX8XKPm8ic4mgiCzjUCNk",
      };
      testNetwork(done, params);
  });
@@@ -1355,6 -1348,20 +1355,20 @@@ it('Allows selection of Phore', functio
      };
      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) {