arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2025-01-01 03:40:53 +00:00
Code Issues Releases Wiki Activity

Merge pull request #312 from trezor/fix/bignumber-amount-cpu

Browse Source 
Faster BigNumber to string conversion
This commit is contained in:
Vladimir Volek 2019-01-08 16:50:08 +01:00 committed by GitHub
commit 8820aa68f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/actions/ethereum/SendFormValidationActions.js
View File

@ -115,7 +115,7 @@ export const recalculateTotalAmount = ($state: State): PayloadAction<State> => (
if (isToken) { if (isToken) {
const token = findToken(tokens, account.descriptor, state.currency, account.deviceState); const token = findToken(tokens, account.descriptor, state.currency, account.deviceState);
if (token) { if (token) {
state.amount = new BigNumber(token.balance).minus(pendingAmount).toString(10); state.amount = new BigNumber(token.balance).minus(pendingAmount).toFixed();
} }
} else { } else {
const b = new BigNumber(account.balance).minus(pendingAmount); const b = new BigNumber(account.balance).minus(pendingAmount);
@ -339,7 +339,7 @@ export const dataValidation = ($state: State): PayloadAction<State> => (): State
export const calculateFee = (gasPrice: string, gasLimit: string): string => { export const calculateFee = (gasPrice: string, gasLimit: string): string => {
try { try {
return EthereumjsUnits.convert(new BigNumber(gasPrice).times(gasLimit), 'gwei', 'ether'); return EthereumjsUnits.convert(new BigNumber(gasPrice).times(gasLimit).toFixed(), 'gwei', 'ether');
} catch (error) { } catch (error) {
return '0'; return '0';
} }
@ -347,7 +347,7 @@ export const calculateFee = (gasPrice: string, gasLimit: string): string => {
export const calculateTotal = (amount: string, gasPrice: string, gasLimit: string): string => { export const calculateTotal = (amount: string, gasPrice: string, gasLimit: string): string => {
try { try {
return new BigNumber(amount).plus(calculateFee(gasPrice, gasLimit)).toString(10); return new BigNumber(amount).plus(calculateFee(gasPrice, gasLimit)).toFixed();
} catch (error) { } catch (error) {
return '0'; return '0';
} }
@ -359,7 +359,7 @@ export const calculateMaxAmount = (balance: BigNumber, gasPrice: string, gasLimi
const fee = calculateFee(gasPrice, gasLimit); const fee = calculateFee(gasPrice, gasLimit);
const max = balance.minus(fee); const max = balance.minus(fee);
if (max.lessThan(0)) return '0'; if (max.lessThan(0)) return '0';
return max.toString(10); return max.toFixed();
} catch (error) { } catch (error) {
return '0'; return '0';
} }
@ -368,8 +368,8 @@ export const calculateMaxAmount = (balance: BigNumber, gasPrice: string, gasLimi
export const getFeeLevels = (symbol: string, gasPrice: BigNumber | string, gasLimit: string, selected?: FeeLevel): Array<FeeLevel> => { export const getFeeLevels = (symbol: string, gasPrice: BigNumber | string, gasLimit: string, selected?: FeeLevel): Array<FeeLevel> => {
const price: BigNumber = typeof gasPrice === 'string' ? new BigNumber(gasPrice) : gasPrice; const price: BigNumber = typeof gasPrice === 'string' ? new BigNumber(gasPrice) : gasPrice;
const quarter: BigNumber = price.dividedBy(4); const quarter: BigNumber = price.dividedBy(4);
const high: string = price.plus(quarter.times(2)).toString(10); const high: string = price.plus(quarter.times(2)).toFixed();
const low: string = price.minus(quarter.times(2)).toString(10); const low: string = price.minus(quarter.times(2)).toFixed();
const customLevel: FeeLevel = selected && selected.value === 'Custom' ? { const customLevel: FeeLevel = selected && selected.value === 'Custom' ? {
value: 'Custom', value: 'Custom',
@ -391,7 +391,7 @@ export const getFeeLevels = (symbol: string, gasPrice: BigNumber | string, gasLi
{ {
value: 'Normal', value: 'Normal',
gasPrice: gasPrice.toString(), gasPrice: gasPrice.toString(),
label: `${calculateFee(price.toString(10), gasLimit)} ${symbol}`, label: `${calculateFee(price.toFixed(), gasLimit)} ${symbol}`,
}, },
{ {
value: 'Low', value: 'Low',

4
src/actions/ripple/SendFormValidationActions.js
View File

@ -237,7 +237,7 @@ export const feeValidation = ($state: State): PayloadAction<State> => (dispatch:
const calculateTotal = (amount: string, fee: string): string => { const calculateTotal = (amount: string, fee: string): string => {
try { try {
return new BigNumber(amount).plus(fee).toString(10); return new BigNumber(amount).plus(fee).toFixed();
} catch (error) { } catch (error) {
return '0'; return '0';
} }
@ -248,7 +248,7 @@ const calculateMaxAmount = (balance: BigNumber, fee: string): string => {
// TODO - minus pendings // TODO - minus pendings
const max = balance.minus(fee); const max = balance.minus(fee);
if (max.lessThan(0)) return '0'; if (max.lessThan(0)) return '0';
return max.toString(10); return max.toFixed();
} catch (error) { } catch (error) {
return '0'; return '0';
} }