m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-26 12:29:06 +01:00
Code

Parse inputs to BigNumber arithmetic in conversion util (#9502)

Browse Source
This commit is contained in:
Erik Marks 2020-10-09 13:01:15 -07:00 committed by GitHub
parent 436b01387c
commit 24d7d1ae2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ui/app/helpers/utils/conversion-util.js
View File

@ -150,13 +150,26 @@ const conversionUtil = (value, {
value: value || '0',
})
const getBigNumber = (value, base) => {
// We don't include 'number' here, because BigNumber will throw if passed
// a number primitive it considers unsafe.
if (
typeof value === 'string' ||
value instanceof BigNumber
) {
return new BigNumber(value, base)
}
return new BigNumber(String(value), base)
}
const addCurrencies = (a, b, options = {}) => {
const {
aBase,
bBase,
...conversionOptions
} = options
const value = (new BigNumber(a.toString(), aBase)).add(b.toString(), bBase)
const value = getBigNumber(a, aBase).add(getBigNumber(b, bBase))
return converter({
value,
@ -170,7 +183,8 @@ const subtractCurrencies = (a, b, options = {}) => {
bBase,
...conversionOptions
} = options
const value = (new BigNumber(String(a), aBase)).minus(b, bBase)
const value = getBigNumber(a, aBase)
.minus(getBigNumber(b, bBase))
return converter({
value,
@ -185,10 +199,8 @@ const multiplyCurrencies = (a, b, options = {}) => {
...conversionOptions
} = options
const bigNumberA = new BigNumber(String(a), multiplicandBase)
const bigNumberB = new BigNumber(String(b), multiplierBase)
const value = bigNumberA.times(bigNumberB)
const value = getBigNumber(a, multiplicandBase)
.times(getBigNumber(b, multiplierBase))
return converter({
value,