Skip to content

[BWS] move _validateAddr() to ChainService #2522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matiu merged 1 commit into from
Nov 20, 2019
Merged

[BWS] move _validateAddr() to ChainService #2522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 26 additions & 4 deletions packages/bitcore-wallet-service/src/lib/chain/btc/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const Defaults = Common.Defaults;
const Errors = require('../../errors/errordefinitions');

export class BtcChain implements IChain {
constructor(private bitcoreLib = BitcoreLib) {}
constructor(private bitcoreLib = BitcoreLib) { }

getWalletBalance(server, wallet, opts, cb) {
server._getUtxosForCurrentWallet(
Expand Down Expand Up @@ -151,7 +151,7 @@ export class BtcChain implements IChain {
});
} else {
if (opts.changeAddress) {
const addrErr = server._validateAddr(
const addrErr = this.validateAddress(
wallet,
opts.changeAddress,
opts
Expand Down Expand Up @@ -355,9 +355,9 @@ export class BtcChain implements IChain {
return false;
}

addressFromStorageTransform(network, address) {}
addressFromStorageTransform(network, address) { }

addressToStorageTransform(network, address) {}
addressToStorageTransform(network, address) { }

addSignaturesToBitcoreTx(tx, inputs, inputPaths, signatures, xpub) {
if (signatures.length != inputs.length)
Expand Down Expand Up @@ -388,4 +388,26 @@ export class BtcChain implements IChain {

if (i != tx.inputs.length) throw new Error('Wrong signatures');
}

validateAddress(wallet, inaddr, opts) {
const A = this.bitcoreLib.Address;
let addr: {
network?: string;
toString?: (cashAddr: boolean) => string;
} = {};
try {
addr = new A(inaddr);
} catch (ex) {
return Errors.INVALID_ADDRESS;
}
if (addr.network.toString() != wallet.network) {
return Errors.INCORRECT_ADDRESS_NETWORK;
}

if (wallet.coin == 'bch' && !opts.noCashAddr) {
if (addr.toString(true) != inaddr) return Errors.ONLY_CASHADDR;
}

return;
}
}
25 changes: 20 additions & 5 deletions packages/bitcore-wallet-service/src/lib/chain/eth/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Transactions } from 'crypto-wallet-core';
import { Transactions, Validation } from 'crypto-wallet-core';
import _ from 'lodash';
import { IAddress } from 'src/lib/model/address';
import { IChain } from '..';
Expand Down Expand Up @@ -94,9 +94,9 @@ export class EthChain implements IChain {
});
}

getChangeAddress() {}
getChangeAddress() { }

checkDust(output, opts) {}
checkDust(output, opts) { }

getFee(server, wallet, opts) {
return new Promise(resolve => {
Expand Down Expand Up @@ -213,7 +213,7 @@ export class EthChain implements IChain {
);
}

checkUtxos(opts) {}
checkUtxos(opts) { }

checkValidTxAmount(output): boolean {
if (
Expand All @@ -226,7 +226,7 @@ export class EthChain implements IChain {
return true;
}

setInputs() {}
setInputs() { }

isUTXOCoin() {
return false;
Expand Down Expand Up @@ -269,4 +269,19 @@ export class EthChain implements IChain {
}
tx.uncheckedSerialize = () => signedTxs;
}

validateAddress(wallet, inaddr, opts) {
const chain = 'ETH';
try {
Validation.validateAddress(
chain,
wallet.network, // not really used for ETH. wallet.network is 'livenet/testnet/regtest' in wallet.
inaddr,
);
} catch (ex) {
return Errors.INVALID_ADDRESS;
}

return;
}
}
23 changes: 14 additions & 9 deletions packages/bitcore-wallet-service/src/lib/chain/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,27 @@ const Common = require('../common');
const Constants = Common.Constants;

export interface IChain {
getWalletBalance(server: WalletService, wallet: IWallet, opts: {coin: string, addresses: string[]} & any, cb);
getWalletSendMaxInfo(server: WalletService, wallet: IWallet, opts: {excludeUnconfirmedUtxos: string, returnInputs: string, from: string, feePerKb: number} & any, cb);
getWalletBalance(server: WalletService, wallet: IWallet, opts: { coin: string, addresses: string[] } & any, cb);
getWalletSendMaxInfo(server: WalletService, wallet: IWallet, opts: { excludeUnconfirmedUtxos: string, returnInputs: string, from: string, feePerKb: number } & any, cb);
getDustAmountValue();
getTransactionCount(server: WalletService, wallet: IWallet, from: string);
getChangeAddress(server: WalletService, wallet: IWallet, opts: {changeAddress: string} & any);
checkDust(output: {amount: number, toAddress: string, valid: boolean}, opts: {outputs: any[]} & any);
getFee(server: WalletService, wallet: IWallet, opts: {fee: number, feePerKb: number} & any);
getChangeAddress(server: WalletService, wallet: IWallet, opts: { changeAddress: string } & any);
checkDust(output: { amount: number, toAddress: string, valid: boolean }, opts: { outputs: any[] } & any);
getFee(server: WalletService, wallet: IWallet, opts: { fee: number, feePerKb: number } & any);
buildTx(txp: TxProposal);
convertFeePerKb(p: number, feePerKb: number);
checkTx(server: WalletService, txp: ITxProposal);
checkTxUTXOs(server: WalletService, txp: ITxProposal, opts: {noCashAddr: boolean} & any, cb);
selectTxInputs(server: WalletService, txp: ITxProposal, wallet: IWallet, opts: {utxosToExclude: any[]} & any, cb, next);
checkUtxos(opts: { fee: number, inputs: any[]});
checkTxUTXOs(server: WalletService, txp: ITxProposal, opts: { noCashAddr: boolean } & any, cb);
selectTxInputs(server: WalletService, txp: ITxProposal, wallet: IWallet, opts: { utxosToExclude: any[] } & any, cb, next);
checkUtxos(opts: { fee: number, inputs: any[] });
checkValidTxAmount(output): boolean;
setInputs(info: {inputs: any[]});
setInputs(info: { inputs: any[] });
isUTXOCoin(): boolean;
isSingleAddress(): boolean;
addSignaturesToBitcoreTx(tx: string, inputs: any[], inputPaths: any[], signatures: any[], xpub: string);
addressToStorageTransform(network: string, address: {}): void;
addressFromStorageTransform(network: string, address: {}): void;
validateAddress(wallet: IWallet, inaddr: string, opts: { noCashAddr: boolean } & any);
}

const chain: { [chain: string]: IChain } = {
Expand Down Expand Up @@ -129,6 +130,10 @@ class ChainProxy {
addSignaturesToBitcoreTx(coin, tx, inputs, inputPaths, signatures, xpub) {
return this.get(coin).addSignaturesToBitcoreTx(tx, inputs, inputPaths, signatures, xpub);
}

validateAddress(wallet, inaddr, opts) {
return this.get(wallet.coin).validateAddress(wallet, inaddr, opts);
}
}

export let ChainService = new ChainProxy();
46 changes: 5 additions & 41 deletions packages/bitcore-wallet-service/src/lib/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ export class WalletService {
initFiatRateService(next);
}
],
(err) => {
(err) => {
lock = opts.lock || new Lock(storage, opts.lockOpts);

if (err) {
Expand Down Expand Up @@ -535,7 +535,7 @@ export class WalletService {

if (opts.coin === 'eth' && opts.n > 1) {
return cb(
new ClientError( 'Multisig ETH wallet not supported')
new ClientError('Multisig ETH wallet not supported')
);
}

Expand Down Expand Up @@ -1379,7 +1379,7 @@ export class WalletService {
this.storage.fetchAddresses(this.walletId, (err, addresses) => {
if (err) return cb(err);
if (!_.isEmpty(addresses)) {
let x = _.head(addresses);
let x = _.head(addresses);
ChainService.addressFromStorageTransform(wallet.coin, wallet.network, x);
return cb(null, x);
}
Expand All @@ -1398,7 +1398,7 @@ export class WalletService {
opts.singleAddress = true;
}

this._canCreateAddress(opts.ignoreMaxGap || opts.singleAddress || wallet.singleAddress, (err, canCreate) => {
this._canCreateAddress(opts.ignoreMaxGap || opts.singleAddress || wallet.singleAddress, (err, canCreate) => {
if (err) return cb(err);
if (!canCreate) return cb(Errors.MAIN_ADDRESS_GAP_REACHED);

Expand Down Expand Up @@ -2317,42 +2317,6 @@ export class WalletService {
);
}

_validateAddr(wallet, inaddr, opts) {
if (!Constants.UTXO_COINS[wallet.coin.toUpperCase()]) {
const chain = ChainService.getChain(wallet.coin);
try {
Validation.validateAddress(
chain,
wallet.network, // not really used for ETH. wallet.network is 'livenet/testnet/regtest' in wallet.
inaddr,
);
} catch (ex) {
return Errors.INVALID_ADDRESS;
}

} else {
const A = Bitcore_[wallet.coin].Address;
let addr: {
network?: string;
toString?: (cashAddr: boolean) => string;
} = {};
try {
addr = new A(inaddr);
} catch (ex) {
return Errors.INVALID_ADDRESS;
}
if (addr.network.toString() != wallet.network) {
return Errors.INCORRECT_ADDRESS_NETWORK;
}

if (wallet.coin == 'bch' && !opts.noCashAddr) {
if (addr.toString(true) != inaddr) return Errors.ONLY_CASHADDR;
}
}

return;
}

_validateOutputs(opts, wallet, cb) {
if (_.isEmpty(opts.outputs))
return new ClientError('No outputs were specified');
Expand All @@ -2361,7 +2325,7 @@ export class WalletService {
const output = opts.outputs[i];
output.valid = false;

const addrErr = this._validateAddr(wallet, output.toAddress, opts);
const addrErr = ChainService.validateAddress(wallet, output.toAddress, opts);
if (addrErr) return addrErr;

if (!checkRequired(output, ['toAddress', 'amount'])) {
Expand Down