mirror of
https://github.com/BlueWallet/BlueWallet.git
synced 2024-11-19 01:40:12 +01:00
ADD: can add regular onchain address as contact
This commit is contained in:
parent
fc868c020f
commit
8bfe3ae17d
@ -3,6 +3,7 @@ import BIP47Factory from '@spsina/bip47';
|
||||
import { SilentPayment } from 'silent-payments';
|
||||
|
||||
import ecc from '../blue_modules/noble_ecc';
|
||||
import * as bitcoin from 'bitcoinjs-lib';
|
||||
|
||||
export class ContactList {
|
||||
isBip47PaymentCodeValid(pc: string) {
|
||||
@ -21,4 +22,21 @@ export class ContactList {
|
||||
isPaymentCodeValid(pc: string): boolean {
|
||||
return this.isBip47PaymentCodeValid(pc) || this.isBip352PaymentCodeValid(pc);
|
||||
}
|
||||
|
||||
isAddressValid(address: string): boolean {
|
||||
try {
|
||||
bitcoin.address.toOutputScript(address); // throws, no?
|
||||
|
||||
if (!address.toLowerCase().startsWith('bc1')) return true;
|
||||
const decoded = bitcoin.address.fromBech32(address);
|
||||
if (decoded.version === 0) return true;
|
||||
if (decoded.version === 1 && decoded.data.length !== 32) return false;
|
||||
if (decoded.version === 1 && !ecc.isPoint(Buffer.concat([Buffer.from([2]), decoded.data]))) return false;
|
||||
if (decoded.version > 1) return false;
|
||||
// ^^^ some day, when versions above 1 will be actually utilized, we would need to unhardcode this
|
||||
return true;
|
||||
} catch (e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -147,8 +147,8 @@ export default function PaymentCodesList() {
|
||||
}
|
||||
case String(Actions.pay): {
|
||||
const cl = new ContactList();
|
||||
// ok its a SilentPayments code, ok to just send
|
||||
if (cl.isBip352PaymentCodeValid(pc)) {
|
||||
// ok its a SilentPayments code/regular address, no need to check for notif tx, ok to just send
|
||||
if (cl.isBip352PaymentCodeValid(pc) || cl.isAddressValid(pc)) {
|
||||
_navigateToSend(pc);
|
||||
return;
|
||||
}
|
||||
@ -261,6 +261,13 @@ export default function PaymentCodesList() {
|
||||
|
||||
const cl = new ContactList();
|
||||
|
||||
if (cl.isAddressValid(newPc)) {
|
||||
// this is not a payment code but a regular onchain address. pretending its a payment code and adding it
|
||||
foundWallet.addBIP47Receiver(newPc);
|
||||
setReload(Math.random());
|
||||
return;
|
||||
}
|
||||
|
||||
if (!cl.isPaymentCodeValid(newPc)) {
|
||||
presentAlert({ message: loc.bip47.invalid_pc });
|
||||
return;
|
||||
|
@ -3,6 +3,15 @@ import assert from 'assert';
|
||||
import { ContactList } from '../../class/contact-list';
|
||||
|
||||
describe('ContactList', () => {
|
||||
it('isAddressValid()', () => {
|
||||
const cl = new ContactList();
|
||||
assert.ok(cl.isAddressValid('3BDsBDxDimYgNZzsqszNZobqQq3yeUoJf2'));
|
||||
assert.ok(cl.isAddressValid('bc1quuafy8htjjj263cvpj7md84magzmc8svmh8lrm'));
|
||||
assert.ok(cl.isAddressValid('BC1QH6TF004TY7Z7UN2V5NTU4MKF630545GVHS45U7'));
|
||||
|
||||
assert.ok(!cl.isAddressValid('sfhsdhsdf'));
|
||||
});
|
||||
|
||||
it('isPaymentCodeValid()', async () => {
|
||||
const cl = new ContactList();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user