From: iancoleman <1281387+iancoleman@users.noreply.github.com>
Date: Thu, 1 Aug 2019 00:01:17 +0000 (+1000)
Subject: Merge branch 'master' into master
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git;a=commitdiff_plain;h=9f675f2e47f371d2d09bf90f03a2e09ec62a10c4;hp=-c

Merge branch 'master' into master
---

9f675f2e47f371d2d09bf90f03a2e09ec62a10c4
diff --combined src/js/bitcoinjs-extensions.js
index 21a535a,3d0c6bd..b37f58f
--- a/src/js/bitcoinjs-extensions.js
+++ b/src/js/bitcoinjs-extensions.js
@@@ -1616,13 -1616,13 +1616,25 @@@ bitcoinjs.bitcoin.networks.deeponion = 
      wif: 0x9F,
  };
  
++
 +bitcoinjs.bitcoin.networks.cpuchain = {
 +    messagePrefix: 'x18CPUchain Signed Message:\n',
 +    bip32: {
 +      public: 0x0488B21E,
 +      private: 0x0488ADE4,
 +    },
 +    pubKeyHash: 0x1C,
 +    scriptHash: 0x1E,
 +    wif: 0x80,
 +};
++
+ bitcoinjs.bitcoin.networks.wagerr = {
+   messagePrefix: 'unused',
+   bip32: {
+     public: 0x022d2533,
+     private: 0x0221312b
+   },
+   pubKeyHash: 0x49,
+   scriptHash: 0x3f,
+   wif: 0xc7
+ };
diff --combined src/js/index.js
index 704d4e0,544e67d..3afa598
--- a/src/js/index.js
+++ b/src/js/index.js
@@@ -1902,13 -1902,6 +1902,13 @@@
                  setHdCoin(71);
              },
          },
 +        {
 +            name: "CPU - CPUchain",
 +            onSelect: function() {
 +                network = bitcoinjs.bitcoin.networks.cpuchain;
 +                setHdCoin(363);
 +            },
 +        },
          {
              name: "CRAVE - Crave",
              onSelect: function() {
@@@ -2748,6 -2741,13 +2748,13 @@@
                  setHdCoin(28);
              },
          },
+         {
+             name: "WGR - Wagerr",
+             onSelect: function() {
+                 network = bitcoinjs.bitcoin.networks.wagerr;
+                 setHdCoin(7825266);
+             },
+         },
          {
              name: "WC - Wincoin",
              onSelect: function() {
diff --combined tests/spec/tests.js
index f307312,5e65714..91a9bec
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@@ -829,13 -829,6 +829,13 @@@ it('Allows selection of Compcoin', func
      };
      testNetwork(done, params);
  });
 +it('Allows selection of CPUchain', function(done) {
 +    var params = {
 +        selectText: "CPU - CPUchain",
 +        firstAddress: "CWWkTPkNRdpTDSfPw7gxUt9cEaC5PSsP3Y",
 +    };
 +    testNetwork(done, params);
 +});
  it('Allows selection of Crave', function(done) {
      var params = {
          selectText: "CRAVE - Crave",
@@@ -1543,6 -1536,13 +1543,13 @@@ it('Allows selection of Stellar', funct
      };
      testNetwork(done, params);
  });
+ it('Allows selection of Wagerr', function(done) {
+     var params = {
+         selectText: "WGR - Wagerr",
+         firstAddress: "WYiVgQU39VcQxcnacoCiaZHZZLjDCJoS95",
+     };
+     testNetwork(done, params);
+ });
  
  // BIP39 seed is set from phrase
  it('Sets the bip39 seed from the prhase', function(done) {