aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriancoleman <1281387+iancoleman@users.noreply.github.com>2019-08-01 10:01:17 +1000
committerGitHub <noreply@github.com>2019-08-01 10:01:17 +1000
commit9f675f2e47f371d2d09bf90f03a2e09ec62a10c4 (patch)
treef86d2f059cd911cd8e7ea28e13ff7f42fd663be9
parent519e9dc728f03eab31c8b050f174119a1dcccd59 (diff)
parente5c4aa40984d427444ff21db93d32be85af95f28 (diff)
downloadBIP39-9f675f2e47f371d2d09bf90f03a2e09ec62a10c4.tar.gz
BIP39-9f675f2e47f371d2d09bf90f03a2e09ec62a10c4.tar.zst
BIP39-9f675f2e47f371d2d09bf90f03a2e09ec62a10c4.zip
Merge branch 'master' into master
-rw-r--r--src/js/bitcoinjs-extensions.js12
-rw-r--r--src/js/index.js7
-rw-r--r--tests/spec/tests.js7
3 files changed, 26 insertions, 0 deletions
diff --git a/src/js/bitcoinjs-extensions.js b/src/js/bitcoinjs-extensions.js
index 21a535a..b37f58f 100644
--- a/src/js/bitcoinjs-extensions.js
+++ b/src/js/bitcoinjs-extensions.js
@@ -1616,6 +1616,7 @@ bitcoinjs.bitcoin.networks.deeponion = {
1616 wif: 0x9F, 1616 wif: 0x9F,
1617}; 1617};
1618 1618
1619
1619bitcoinjs.bitcoin.networks.cpuchain = { 1620bitcoinjs.bitcoin.networks.cpuchain = {
1620 messagePrefix: 'x18CPUchain Signed Message:\n', 1621 messagePrefix: 'x18CPUchain Signed Message:\n',
1621 bip32: { 1622 bip32: {
@@ -1626,3 +1627,14 @@ bitcoinjs.bitcoin.networks.cpuchain = {
1626 scriptHash: 0x1E, 1627 scriptHash: 0x1E,
1627 wif: 0x80, 1628 wif: 0x80,
1628}; 1629};
1630
1631bitcoinjs.bitcoin.networks.wagerr = {
1632 messagePrefix: 'unused',
1633 bip32: {
1634 public: 0x022d2533,
1635 private: 0x0221312b
1636 },
1637 pubKeyHash: 0x49,
1638 scriptHash: 0x3f,
1639 wif: 0xc7
1640};
diff --git a/src/js/index.js b/src/js/index.js
index 704d4e0..3afa598 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -2749,6 +2749,13 @@
2749 }, 2749 },
2750 }, 2750 },
2751 { 2751 {
2752 name: "WGR - Wagerr",
2753 onSelect: function() {
2754 network = bitcoinjs.bitcoin.networks.wagerr;
2755 setHdCoin(7825266);
2756 },
2757 },
2758 {
2752 name: "WC - Wincoin", 2759 name: "WC - Wincoin",
2753 onSelect: function() { 2760 onSelect: function() {
2754 network = bitcoinjs.bitcoin.networks.wincoin; 2761 network = bitcoinjs.bitcoin.networks.wincoin;
diff --git a/tests/spec/tests.js b/tests/spec/tests.js
index f307312..91a9bec 100644
--- a/tests/spec/tests.js
+++ b/tests/spec/tests.js
@@ -1543,6 +1543,13 @@ it('Allows selection of Stellar', function(done) {
1543 }; 1543 };
1544 testNetwork(done, params); 1544 testNetwork(done, params);
1545}); 1545});
1546it('Allows selection of Wagerr', function(done) {
1547 var params = {
1548 selectText: "WGR - Wagerr",
1549 firstAddress: "WYiVgQU39VcQxcnacoCiaZHZZLjDCJoS95",
1550 };
1551 testNetwork(done, params);
1552});
1546 1553
1547// BIP39 seed is set from phrase 1554// BIP39 seed is set from phrase
1548it('Sets the bip39 seed from the prhase', function(done) { 1555it('Sets the bip39 seed from the prhase', function(done) {