mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-11-24 11:01:41 +01:00
cc78378b8e
In the case where the initial spend limit for the `approve` function was set to the maximum amount, editing this value would result in the new limit being silently ignored. The transaction would be submitted with the original max spend limit. This occurred because function to generate the new custom data would look for the expected spend limit in the existing data, then bail if it was not found (and in these cases, it was never found). The reason the value was not found is that it was erroneously being converted to a `Number`. A JavaScript `Number` is not precise enough to represent larger spend limits, so it would give the wrong hex value (after rounding had taken place in the conversion to a floating-point number). The data string is now updated without relying upon the original token value; the new value is inserted after the `spender` argument instead, as the remainder of the `data` string is guaranteed to be the original limit. Additionally, the conversion to a `Number` is now omitted so that the custom spend limit is encoded correctly. Fixes #7915
34 lines
1.3 KiB
JavaScript
34 lines
1.3 KiB
JavaScript
import { decimalToHex } from '../../helpers/utils/conversions.util'
|
|
import { calcTokenValue } from '../../helpers/utils/token-util.js'
|
|
import { getTokenData } from '../../helpers/utils/transactions.util'
|
|
|
|
export function getCustomTxParamsData (data, { customPermissionAmount, decimals }) {
|
|
const tokenData = getTokenData(data)
|
|
|
|
if (!tokenData) {
|
|
throw new Error('Invalid data')
|
|
} else if (tokenData.name !== 'approve') {
|
|
throw new Error(`Invalid data; should be 'approve' method, but instead is '${tokenData.name}'`)
|
|
}
|
|
let spender = tokenData.params[0].value
|
|
if (spender.startsWith('0x')) {
|
|
spender = spender.substring(2)
|
|
}
|
|
const [signature, tokenValue] = data.split(spender)
|
|
|
|
if (!signature || !tokenValue) {
|
|
throw new Error('Invalid data')
|
|
} else if (tokenValue.length !== 64) {
|
|
throw new Error('Invalid token value; should be exactly 64 hex digits long (u256)')
|
|
}
|
|
|
|
let customPermissionValue = decimalToHex(calcTokenValue(customPermissionAmount, decimals))
|
|
if (customPermissionValue.length > 64) {
|
|
throw new Error('Custom value is larger than u256')
|
|
}
|
|
|
|
customPermissionValue = customPermissionValue.padStart(tokenValue.length, '0')
|
|
const customTxParamsData = `${signature}${spender}${customPermissionValue}`
|
|
return customTxParamsData
|
|
}
|