Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/bch_validator.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ var BTCValidator = require('./bitcoin_validator');

function validateAddress(address, currency, opts) {
var networkType = opts ? opts.networkType : ''
var prefix = 'bitcoincash';
var prefix = networkType === 'testnet' ? 'bchtest' : 'bitcoincash';
var regexp = new RegExp(currency.regexp);
var raw_address;

var res = address.split(':');
if (res.length === 1) {
raw_address = address
} else {
if (res[0] !== 'bitcoincash') {
if (res[0] !== prefix) {
return false;
}
raw_address = res[1];
Expand All @@ -27,9 +27,6 @@ function validateAddress(address, currency, opts) {
}

var decoded = cryptoUtils.base32.b32decode(raw_address);
if (networkType === 'testnet') {
prefix = 'bchtest';
}

try {
if (bech32.verifyChecksum(prefix, decoded, bech32.encodings.BECH32)) {
Expand Down
1 change: 1 addition & 0 deletions test/wallet_address_validator.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ describe('WAValidator.validate()', function () {
valid('2MxKEf2su6FGAUfCEAHreGFQvEYrfYNHvL7', 'bitcoincash', 'testnet');

valid('bitcoincash:qq4v32mtagxac29my6gwj6fd4tmqg8rysu23dax807', 'bch');
valid('bchtest:qrkj74zm8fx03z9lcn2h3z8s9y9fm4zujca7xakccw', 'bch', 'testnet');

});

Expand Down