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=-c

Merge pull request #352 from PavlosTze/bsv-rpd-monkey-arya

Support BSV, RPD, MONKEY, ARYA
---

c6c86591a9c87cc85e12c8ee6591099b0f502070
diff --combined src/js/bitcoinjs-extensions.js
index 1a28628,0658ae7..ac9f315
--- a/src/js/bitcoinjs-extensions.js
+++ b/src/js/bitcoinjs-extensions.js
@@@ -1462,17 -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: {
@@@ -1649,3 -1638,48 +1649,48 @@@ bitcoinjs.bitcoin.networks.wagerr = 
    scriptHash: 0x3f,
    wif: 0xc7
  };
+ 
+ bitcoinjs.bitcoin.networks.bitcoinsv = {
+   messagePrefix: 'unused',
+   bip32: {
+     public: 0x0488b21e,
+     private: 0x0488ade4
+   },
+   pubKeyHash: 0x00,
+   scriptHash: 0x05,
+   wif: 0x80
+ };
+ 
+ bitcoinjs.bitcoin.networks.monkeyproject = {
+   messagePrefix: 'Monkey Signed Message:\n',
+   bip32: {
+     public: 0x0488b21e,
+     private: 0x0488dde4
+   },
+   pubKeyHash: 0x33,
+   scriptHash: 0x1c,
+   wif: 0x37
+ };
+ 
+ bitcoinjs.bitcoin.networks.rapids = {
+   messagePrefix: 'DarkNet Signed Message:\n',
+   bip32: {
+     public: 0x0488b21e,
+     private: 0x0488ade4
+   },
+   pubKeyHash: 0x3d,
+   scriptHash: 0x06,
+   wif: 0x2e
+ };
+ 
+ bitcoinjs.bitcoin.networks.aryacoin = {
+   messagePrefix: '\x18Aryacoin Signed Message:\n',
+   bech32: 'arya',
+   bip32: {
+     public: 0x0488B21E,
+     private: 0x0488ADE4,
+   },
+   pubKeyHash: 0x17,
+   scriptHash: 0x6f,
+   wif: 0x97
+ };
diff --combined src/js/index.js
index deb88d4,b3450d3..fff1e40
--- a/src/js/index.js
+++ b/src/js/index.js
@@@ -1696,6 -1696,13 +1696,13 @@@
                  setHdCoin(161);
              },
          },
+         {
+             name: "ARYA - Aryacoin",
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.aryacoin;
+                 setHdCoin(357);
+             },
+         },
          {
              name: "AUR - Auroracoin",
              onSelect: function() {
@@@ -1829,6 -1836,13 +1836,13 @@@
                  setHdCoin(183);
              },
          },
+         {
+             name: "BSV - BitcoinSV",
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.bitcoinsv;
+                 setHdCoin(236);
+             },
+         },
          {
              name: "BTCZ - Bitcoinz",
              onSelect: function() {
@@@ -2185,18 -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",
@@@ -2344,6 -2351,13 +2358,13 @@@
                  setHdCoin(22);
              },
          },
+         {
+             name: "MONK - Monkey Project",
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.monkeyproject,
+                 setHdCoin(214);
+             },
+         },
          {
              name: "MUSIC - Musicoin",
              segwitAvailable: false,
@@@ -2550,6 -2564,13 +2571,13 @@@
                  setHdCoin(122);
              },
          },
+         {
+             name: "RPD - Rapids",
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.rapids;
+                 setHdCoin(320);
+             },
+         },
          {
              name: "RVN - Ravencoin",
              onSelect: function() {
@@@ -2867,7 -2888,7 +2895,7 @@@
              },
          },
          {
 -            name: "ZEN - Zencash",
 +            name: "ZEN - Horizen",
              onSelect: function() {
                  network = bitcoinjs.bitcoin.networks.zencash;
                  setHdCoin(121);
diff --combined tests/spec/tests.js
index 76f5297,8b77b4a..0901311
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@@ -732,6 -732,13 +732,13 @@@ it('Allows selection of Asiacoin', func
      };
      testNetwork(done, params);
  });
+ it('Allows selection of Aryacoin', function(done) {
+     var params = {
+         selectText: "ARYA - Aryacoin",
+         firstAddress: "Abr6gX25KaU9BpwD34UfsL3A4n89NvYYSf",
+     };
+     testNetwork(done, params);
+ });
  it('Allows selection of Auroracoin', function(done) {
      var params = {
          selectText: "AUR - Auroracoin",
@@@ -774,6 -781,13 +781,13 @@@ it('Allows selection of Bitcoin Private
      };
      testNetwork(done, params);
  });
+ it('Allows selection of Bitcoin SV', function(done) {
+     var params = {
+         selectText: "BSV - BitcoinSV",
+         firstAddress: "1N4mgtE5yxifch9jWs7Sds6oVqxdy2t576",
+     };
+     testNetwork(done, params);
+ });
  it('Allows selection of Bitcoinz', function(done) {
      var params = {
          selectText: "BTCZ - Bitcoinz",
@@@ -1180,6 -1194,13 +1194,13 @@@ it('Allows selection of Putincoin', fun
      };
      testNetwork(done, params);
  });
+ it('Allows selection of Rapids', function(done) {
+     var params = {
+         selectText: "RPD - Rapids",
+         firstAddress: "Ri8XxUdZaXS5LqxmFJcFEjFinkaMbmhSUp",
+     };
+     testNetwork(done, params);
+ });
  it('Allows selection of Ravencoin', function(done) {
      var params = {
          selectText: "RVN - Ravencoin",
@@@ -1376,9 -1397,9 +1397,9 @@@ it('Allows selection of Zclassic', func
      };
      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);
@@@ -1411,6 -1432,14 +1432,14 @@@ it('Allows selection of MIX', function(
      };
      testNetwork(done, params);
  });
+ it('Allows selection of Monkey Project', function(done) {
+     var params = {
+         selectText: "MONK - Monkey Project",
+         firstAddress: "MnLrcnnUzKnf7TzufjRe5DLZqQJz18oYyu",
+     };
+     testNetwork(done, params);
+ });
+ 
  it('Allows selection of Musicoin', function(done) {
      var params = {
          selectText: "MUSIC - Musicoin",
@@@ -1441,18 -1470,11 +1470,18 @@@ it('Allows selection of Callisto', func
  });
  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",