diff --git a/src/js/services/bitcoin-uri.service.js b/src/js/services/bitcoin-uri.service.js index cb79c9354..ebd74fc25 100644 --- a/src/js/services/bitcoin-uri.service.js +++ b/src/js/services/bitcoin-uri.service.js @@ -6,13 +6,16 @@ .module('bitcoincom.services') .factory('bitcoinUriService', bitcoinUriService); - function bitcoinUriService(bitcoinCashJsService) { + function bitcoinUriService(bitcoinCashJsService, bwcService) { + var bitcore = bwcService.getBitcore(); var service = { parse: parse }; return service; + + /* For parsing: BIP21 @@ -152,12 +155,12 @@ var legacyRe = /^[13][a-km-zA-HJ-NP-Z1-9]{25,34}$/; var legacyTestnetRe = /^[mn][a-km-zA-HJ-NP-Z1-9]{25,34}$/; - if (legacyRe.test(address)) { + if (legacyRe.test(address) && bitcore.Address.isValid(address, 'livenet')) { parsed.address = address; parsed.legacyAddress = address; parsed.testnet = false; - } else if (legacyTestnetRe.test(address)) { + } else if (legacyTestnetRe.test(address) && bitcore.Address.isValid(address, 'testnet')) { parsed.address = address; parsed.legacyAddress = address; parsed.testnet = true; diff --git a/src/js/services/bitcoin-uri.service.spec.js b/src/js/services/bitcoin-uri.service.spec.js index f13048c9e..a2a0cc894 100644 --- a/src/js/services/bitcoin-uri.service.spec.js +++ b/src/js/services/bitcoin-uri.service.spec.js @@ -4,6 +4,7 @@ fdescribe('bitcoinUriService', function() { beforeEach(function() { module('bitcoinCashJsModule'); module('bitcoincom.services'); + module('bwcModule'); inject(function($injector){ bitcoinUriService = $injector.get('bitcoinUriService');