Skip to content
Merged
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
20 changes: 0 additions & 20 deletions app/lib/verify-address.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,6 @@ describe('verifyXpub', () => {
expect(verifyXpub(invalid)).toBe(false);
});

test('Testnet Segwit', () => {
const valid = 'tpubDDmYUCp38iSBdNXvGvNuPSpKCRZp8Qs2MNchdr6rAkwA36KjZDkveF5pZ3gU5CJGuYvcuj2CwveKgQDBRJh9vH784hSpvubS9zw2wCoDtzn';
expect(verifyXpub(valid)).toBe(true);
});

test('Testnet P2PKH', () => {
const valid = 'tpubDDCnvgBWxj9Ybh6zg6c1atUtpfFWbqnrEcWWrtXmWSMuqsWrhSzPc73fE7cYiJjVtsY9JE9JBwZyFbdPQ9SqbW6YLymzx5j1WS3wVz4vN46';
expect(verifyXpub(valid)).toBe(true);
});

test('Testnet P2TR', () => {
const valid = 'tpubDCdJV3Q5vPhUmKiSCiS68w43yKZKEZsd8wxa3t8q4DsPjfejaPDT76SDcf6iscyvLnpz4UXFMzVXxZmH5U6XEQfQYGit5NQCH1McwNSHQhq';
expect(verifyXpub(valid)).toBe(true);
});

test('Testnet garbage', () => {
const invalid = 'tpubDCdJV3Q5vPhUmKiSCiS68w43yKZKEZsd8wxa3t8q4DsPjfejaPDT76SDcf6iscyvLnpz4UXFMzVXxZmH5U6XEQfQYGit';
expect(verifyXpub(invalid)).toBe(false);
});

test('ypub', () => {});

test('zpub', () => {});
Expand Down
9 changes: 2 additions & 7 deletions app/lib/verify-address.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,8 @@ export function getAllAddresses(wallet: Wallet, i: number): Address[] {
}
}


function getNetwork(wallet: Wallet) {
return (wallet.keys[0].value.startsWith('tpub')) ? bitcoin.networks.testnet : bitcoin.networks.bitcoin;
}

function getSingleSigAddress(wallet: Wallet, account: number, i: number, type: AddressType, bip32: any): string {
const network = getNetwork(wallet);
const network = bitcoin.networks.bitcoin;

const pubkey = toHex(wallet.keys[0], account, i, bip32);

Expand All @@ -74,7 +69,7 @@ function getSingleSigAddress(wallet: Wallet, account: number, i: number, type: A
}

function getMultiSigAddress(wallet: Wallet, account: number, i: number, type: AddressType, bip32: any): string {
const network = getNetwork(wallet);
const network = bitcoin.networks.bitcoin;

var pubkeys = wallet.keys
.map((key) => toHex(key, account, i, bip32))
Expand Down
6 changes: 1 addition & 5 deletions src/app/shared/services/regex.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,13 @@ const XPUB_REGEX = '^([xyYzZtuUvV]pub[1-9A-HJ-NP-Za-km-z]{79,108})$';

export const AddressRegExp = new RegExp('^[13][a-km-zA-HJ-NP-Z1-9]{25,34}$');
export const SegwitAddressRegExp = new RegExp('^bc1[0-9a-zA-Z]{25,65}$');
export const TestnetAddressRegExp = new RegExp('^tb1[0-9a-zA-Z]{25,65}$');
export const TestnetLegacyAddressRegExp = new RegExp('^[2mn](?!sec|pub)[0-9a-zA-Z]{25,65}$');
export const ExtendedKeyRegExp = new RegExp(XPUB_REGEX);
export const NostrPubKeyRegExp = new RegExp('^npub[0-9a-z]{58,65}$');
export const NostrPrivateKeyRegExp = new RegExp('^nsec[0-9a-z]{58,65}$');
export const LightningAddressRegExp = new RegExp('^[lL][nN][bB][cC][a-zA-z0-9]+$');
export const isBitcoinAddress = (text: string) => {
return (
AddressRegExp.test(text) ||
SegwitAddressRegExp.test(text) ||
TestnetAddressRegExp.test(text) ||
(TestnetLegacyAddressRegExp.test(text))
SegwitAddressRegExp.test(text)
);
};
Loading