anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Legacy addresses with bitcoincash: prefix.

Browse source
This commit is contained in:
Brendon Duncan 2018-08-28 17:10:15 +12:00
commit e8005c9ea6
2 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/services/bitcoin-uri.service.js
View file

@ -311,12 +311,12 @@
parsed.legacyAddress = cashAddrMainnet.toString();
parsed.testnet = false;
} else if (bitcore.Address.isValid(address, 'livenet') && parsed.coin !== 'bch') {
} else if (bitcore.Address.isValid(address, 'livenet')) {
parsed.address = address;
parsed.legacyAddress = address;
parsed.testnet = false;
} else if (bitcore.Address.isValid(address, 'testnet') && parsed.coin !== 'bch') {
} else if (bitcore.Address.isValid(address, 'testnet')) {
parsed.address = address;
parsed.legacyAddress = address;
parsed.testnet = true;

21
src/js/services/bitcoin-uri.service.spec.js
View file

@ -17,7 +17,7 @@ fdescribe('bitcoinUriService', function() {
var parsed = bitcoinUriService.parse('bitcoin:?r=https://bitpay.com/i/CwzbKP3k3JNgXJBfuoerDr');
expect(parsed.isValid).toBe(true);
expect(parsed.address).toBeUndefined()
expect(parsed.address).toBeUndefined();
expect(parsed.coin).toBe('btc');
expect(parsed.legacyAddress).toBeUndefined();
expect(parsed.testnet).toBeUndefined();
@ -29,7 +29,7 @@ fdescribe('bitcoinUriService', function() {
var parsed = bitcoinUriService.parse('bitcoincash:?r=https://bitpay.com/i/SmHdie5dvBnG5kouZzEPzu');
expect(parsed.isValid).toBe(true);
expect(parsed.address).toBeUndefined()
expect(parsed.address).toBeUndefined();
expect(parsed.coin).toBe('bch');
expect(parsed.legacyAddress).toBeUndefined();
expect(parsed.testnet).toBeUndefined();
@ -40,7 +40,22 @@ fdescribe('bitcoinUriService', function() {
var parsed = bitcoinUriService.parse('bitcoincash:1G9FA9fFnHfTYxvmXeAbBD9FwzPAVMbd3j');
expect(parsed.isValid).toBe(false);
expect(parsed.isValid).toBe(true);
expect(parsed.address).toBe('1G9FA9fFnHfTYxvmXeAbBD9FwzPAVMbd3j');
expect(parsed.coin).toBe('bch');
expect(parsed.legacyAddress).toBe('1G9FA9fFnHfTYxvmXeAbBD9FwzPAVMbd3j');
expect(parsed.testnet).toBe(false);
});
it('Bitcoin Cash prefix with legacy address on testnet', function() {
var parsed = bitcoinUriService.parse('bitcoincash:mkDQrKfSFD441JxrD1iPBsJFExgkvrPGQn');
expect(parsed.isValid).toBe(true);
expect(parsed.address).toBe('mkDQrKfSFD441JxrD1iPBsJFExgkvrPGQn');
expect(parsed.coin).toBe('bch');
expect(parsed.legacyAddress).toBe('mkDQrKfSFD441JxrD1iPBsJFExgkvrPGQn');
expect(parsed.testnet).toBe(true);
});
it('Bitcoin Cash uri with extended params', function() {