Merge branch 'master' into master

This commit is contained in:
iancoleman
2019-08-01 10:01:17 +10:00
committed by GitHub
3 changed files with 26 additions and 0 deletions

View File

@@ -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
};

View File

@@ -2748,6 +2748,13 @@
setHdCoin(28);
},
},
{
name: "WGR - Wagerr",
onSelect: function() {
network = bitcoinjs.bitcoin.networks.wagerr;
setHdCoin(7825266);
},
},
{
name: "WC - Wincoin",
onSelect: function() {

View File

@@ -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) {