mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-02-22 23:08:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

FIX: reject unknown segwit versions as invalid address

Browse source
This commit is contained in:
Overtorment 2021-12-05 18:46:42 +00:00
parent 9b7a0e8580
commit 5f9a1c99cd
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
class/wallets/legacy-wallet.ts
View file

@ -9,6 +9,7 @@ import coinSelect from 'coinselect';
import coinSelectSplit from 'coinselect/split';
import { CreateTransactionResult, CreateTransactionUtxo, Transaction, Utxo } from './types';
import { Signer, ECPair } from 'ecpair';
const ecc = require('tiny-secp256k1');
type CoinselectUtxo = {
vout: number;
@ -513,8 +514,12 @@ export class LegacyWallet extends AbstractWallet {
if (!address.toLowerCase().startsWith('bc1')) return true;
const decoded = bitcoin.address.fromBech32(address);
return decoded.version <= 1;
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;
}

12
screen/send/details.js
View file

@ -287,11 +287,10 @@ const SendDetails = () => {
// replace wrong addresses with dump
targets = targets.map(t => {
try {
bitcoin.address.toOutputScript(t.address);
return t;
} catch (e) {
if (!wallet.isAddressValid(t.address)) {
return { ...t, address: '36JxaUrpDzkEerkTf1FzwHNE1Hb7cCjgJV' };
} else {
return t;
}
});
@ -457,11 +456,8 @@ const SendDetails = () => {
}
if (!error) {
try {
bitcoin.address.toOutputScript(transaction.address);
} catch (err) {
if (!wallet.isAddressValid(transaction.address)) {
console.log('validation error');
console.log(err);
error = loc.send.details_address_field_is_not_valid;
}
}