Merge branch 'master' into master

diff --git a/src/js/bitcoinjs-extensions.js b/src/js/bitcoinjs-extensions.js
index 21a535acc4577bcba28f02562cdb567e39fa5fb5..b37f58f5255302fb4bd4f2a199cc4fec58116fe3 100644 (file)
--- a/src/js/bitcoinjs-extensions.js
+++ b/src/js/bitcoinjs-extensions.js
@@ -1616,6 +1616,7 @@ bitcoinjs.bitcoin.networks.deeponion = {
     wif: 0x9F,
 };
 
+
 bitcoinjs.bitcoin.networks.cpuchain = {
     messagePrefix: 'x18CPUchain Signed Message:\n',
     bip32: {
@@ -1626,3 +1627,14 @@ bitcoinjs.bitcoin.networks.cpuchain = {
     scriptHash: 0x1E,
     wif: 0x80,
 };
+
+bitcoinjs.bitcoin.networks.wagerr = {
+  messagePrefix: 'unused',
+  bip32: {
+    public: 0x022d2533,
+    private: 0x0221312b
+  },
+  pubKeyHash: 0x49,
+  scriptHash: 0x3f,
+  wif: 0xc7
+};

diff --git a/src/js/index.js b/src/js/index.js
index 704d4e00514138e0f9b71f44419e2e7f58151329..3afa598b39238553cd1dfc926f4ecf82e3660a00 100644 (file)
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -2748,6 +2748,13 @@
                 setHdCoin(28);
             },
         },
+        {
+            name: "WGR - Wagerr",
+            onSelect: function() {
+                network = bitcoinjs.bitcoin.networks.wagerr;
+                setHdCoin(7825266);
+            },
+        },
         {
             name: "WC - Wincoin",
             onSelect: function() {

diff --git a/tests/spec/tests.js b/tests/spec/tests.js
index f3073129466409578491a840dcbaedcca49605ca..91a9bec33dbac310ec1d67d0dc3aabd1dccca2c9 100644 (file)
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@ -1543,6 +1543,13 @@ it('Allows selection of Stellar', function(done) {
     };
     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) {