mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-11-24 11:01:41 +01:00
ba25d52670
* Use `AdvancedGasInputs` in `AdvancedTabContent` The `AdvancedGasInputs` component was originally extracted from the `AdvancedTabContent` component, duplicating much of the rendering logic. They have since evolved separately, with bugs being fixed in one place but not the other. The inputs and outputs expected weren't exactly the same, as the `AdvancedGasInputs` component converts the input custom gas price and limit, and it converts them both in the setter methods as well. The `GasModalPageContainer` had to be adjusted to avoid converting these values multiple times. Both components dealt with input debouncing separately, both in less than ideal ways. `AdvancedTabContent` didn't debounce either field, but it did debounce the check for whether the gas limit field was below the minimum value. So if a less-than-minimum value was set, it would be propogated upwards and could be saved if the user clicked 'Save' quickly enough. After a second delay it would snap back to the minimum value. The `AdvancedGasInputs` component debounced both fields, but it would replace any gas limit below the minimum with the minimum value. This led to a problem where a brief pause during typing would reset the field to 21000. The `AdvancedGasInputs` approach was chosen, except that it was updated to no longer change the gas limit if it was below the minimum. Instead it displays an error. Parent components were checked to ensure they would detect the error case of the gas limit being set too low, and prevent the form submission in those cases. Of the three parents, one had already dealt with it correctly, one needed to convert the gas limit from hex first, and another needed the gas limit check added. Closes #6872 * Cleanup send components Empty README files have been removed, and a mistake in the index file for the send page has been corrected. The Gas Slider component class name was updated as well; it looks like it was originally created from `AdvancedTabContent`, so it still had that class name.
616 lines
17 KiB
JavaScript
616 lines
17 KiB
JavaScript
import assert from 'assert'
|
|
import proxyquire from 'proxyquire'
|
|
|
|
const {
|
|
getCustomGasErrors,
|
|
getCustomGasLimit,
|
|
getCustomGasPrice,
|
|
getCustomGasTotal,
|
|
getEstimatedGasPrices,
|
|
getEstimatedGasTimes,
|
|
getPriceAndTimeEstimates,
|
|
getRenderableBasicEstimateData,
|
|
getRenderableEstimateDataForSmallButtonsFromGWEI,
|
|
} = proxyquire('./custom-gas', {})
|
|
|
|
describe('custom-gas selectors', () => {
|
|
|
|
describe('getCustomGasPrice()', () => {
|
|
it('should return gas.customData.price', () => {
|
|
const mockState = { gas: { customData: { price: 'mockPrice' } } }
|
|
assert.equal(getCustomGasPrice(mockState), 'mockPrice')
|
|
})
|
|
})
|
|
|
|
describe('getCustomGasLimit()', () => {
|
|
it('should return gas.customData.limit', () => {
|
|
const mockState = { gas: { customData: { limit: 'mockLimit' } } }
|
|
assert.equal(getCustomGasLimit(mockState), 'mockLimit')
|
|
})
|
|
})
|
|
|
|
describe('getCustomGasTotal()', () => {
|
|
it('should return gas.customData.total', () => {
|
|
const mockState = { gas: { customData: { total: 'mockTotal' } } }
|
|
assert.equal(getCustomGasTotal(mockState), 'mockTotal')
|
|
})
|
|
})
|
|
|
|
describe('getCustomGasErrors()', () => {
|
|
it('should return gas.errors', () => {
|
|
const mockState = { gas: { errors: 'mockErrors' } }
|
|
assert.equal(getCustomGasErrors(mockState), 'mockErrors')
|
|
})
|
|
})
|
|
|
|
describe('getPriceAndTimeEstimates', () => {
|
|
it('should return price and time estimates', () => {
|
|
const mockState = { gas: { priceAndTimeEstimates: 'mockPriceAndTimeEstimates' } }
|
|
assert.equal(getPriceAndTimeEstimates(mockState), 'mockPriceAndTimeEstimates')
|
|
})
|
|
})
|
|
|
|
describe('getEstimatedGasPrices', () => {
|
|
it('should return price and time estimates', () => {
|
|
const mockState = { gas: { priceAndTimeEstimates: [
|
|
{ gasprice: 12, somethingElse: 20 },
|
|
{ gasprice: 22, expectedTime: 30 },
|
|
{ gasprice: 32, somethingElse: 40 },
|
|
] } }
|
|
assert.deepEqual(getEstimatedGasPrices(mockState), [12, 22, 32])
|
|
})
|
|
})
|
|
|
|
describe('getEstimatedGasTimes', () => {
|
|
it('should return price and time estimates', () => {
|
|
const mockState = { gas: { priceAndTimeEstimates: [
|
|
{ somethingElse: 12, expectedTime: 20 },
|
|
{ gasPrice: 22, expectedTime: 30 },
|
|
{ somethingElse: 32, expectedTime: 40 },
|
|
] } }
|
|
assert.deepEqual(getEstimatedGasTimes(mockState), [20, 30, 40])
|
|
})
|
|
})
|
|
|
|
describe('getRenderableBasicEstimateData()', () => {
|
|
const tests = [
|
|
{
|
|
expectedResult: [
|
|
{
|
|
gasEstimateType: 'SLOW',
|
|
feeInSecondaryCurrency: '$0.01',
|
|
feeInPrimaryCurrency: '0.0000525 ETH',
|
|
timeEstimate: '~6 min 36 sec',
|
|
priceInHexWei: '0x9502f900',
|
|
},
|
|
{
|
|
gasEstimateType: 'AVERAGE',
|
|
feeInPrimaryCurrency: '0.000084 ETH',
|
|
feeInSecondaryCurrency: '$0.02',
|
|
priceInHexWei: '0xee6b2800',
|
|
timeEstimate: '~5 min 18 sec',
|
|
},
|
|
{
|
|
gasEstimateType: 'FAST',
|
|
feeInSecondaryCurrency: '$0.03',
|
|
feeInPrimaryCurrency: '0.000105 ETH',
|
|
timeEstimate: '~3 min 18 sec',
|
|
priceInHexWei: '0x12a05f200',
|
|
},
|
|
],
|
|
mockState: {
|
|
metamask: {
|
|
conversionRate: 255.71,
|
|
currentCurrency: 'usd',
|
|
preferences: {
|
|
showFiatInTestnets: false,
|
|
},
|
|
provider: {
|
|
type: 'mainnet',
|
|
},
|
|
},
|
|
gas: {
|
|
basicEstimates: {
|
|
blockTime: 14.16326530612245,
|
|
safeLow: 2.5,
|
|
safeLowWait: 6.6,
|
|
average: 4,
|
|
avgWait: 5.3,
|
|
fast: 5,
|
|
fastWait: 3.3,
|
|
fastest: 10,
|
|
fastestWait: 0.5,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
expectedResult: [
|
|
{
|
|
gasEstimateType: 'SLOW',
|
|
feeInSecondaryCurrency: '$0.27',
|
|
feeInPrimaryCurrency: '0.000105 ETH',
|
|
timeEstimate: '~13 min 12 sec',
|
|
priceInHexWei: '0x12a05f200',
|
|
},
|
|
{
|
|
feeInPrimaryCurrency: '0.000147 ETH',
|
|
feeInSecondaryCurrency: '$0.38',
|
|
gasEstimateType: 'AVERAGE',
|
|
priceInHexWei: '0x1a13b8600',
|
|
timeEstimate: '~10 min 6 sec',
|
|
},
|
|
{
|
|
gasEstimateType: 'FAST',
|
|
feeInSecondaryCurrency: '$0.54',
|
|
feeInPrimaryCurrency: '0.00021 ETH',
|
|
timeEstimate: '~6 min 36 sec',
|
|
priceInHexWei: '0x2540be400',
|
|
},
|
|
],
|
|
mockState: {
|
|
metamask: {
|
|
conversionRate: 2557.1,
|
|
currentCurrency: 'usd',
|
|
send: {
|
|
gasLimit: '0x5208',
|
|
},
|
|
preferences: {
|
|
showFiatInTestnets: false,
|
|
},
|
|
provider: {
|
|
type: 'mainnet',
|
|
},
|
|
},
|
|
gas: {
|
|
basicEstimates: {
|
|
blockTime: 14.16326530612245,
|
|
safeLow: 5,
|
|
safeLowWait: 13.2,
|
|
average: 7,
|
|
avgWait: 10.1,
|
|
fast: 10,
|
|
fastWait: 6.6,
|
|
fastest: 20,
|
|
fastestWait: 1.0,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
expectedResult: [
|
|
{
|
|
gasEstimateType: 'SLOW',
|
|
feeInSecondaryCurrency: '',
|
|
feeInPrimaryCurrency: '0.000105 ETH',
|
|
timeEstimate: '~13 min 12 sec',
|
|
priceInHexWei: '0x12a05f200',
|
|
},
|
|
{
|
|
gasEstimateType: 'AVERAGE',
|
|
feeInPrimaryCurrency: '0.000147 ETH',
|
|
feeInSecondaryCurrency: '',
|
|
timeEstimate: '~10 min 6 sec',
|
|
priceInHexWei: '0x1a13b8600',
|
|
},
|
|
{
|
|
gasEstimateType: 'FAST',
|
|
feeInSecondaryCurrency: '',
|
|
feeInPrimaryCurrency: '0.00021 ETH',
|
|
timeEstimate: '~6 min 36 sec',
|
|
priceInHexWei: '0x2540be400',
|
|
},
|
|
],
|
|
mockState: {
|
|
metamask: {
|
|
conversionRate: 2557.1,
|
|
currentCurrency: 'usd',
|
|
send: {
|
|
gasLimit: '0x5208',
|
|
},
|
|
preferences: {
|
|
showFiatInTestnets: false,
|
|
},
|
|
provider: {
|
|
type: 'rinkeby',
|
|
},
|
|
},
|
|
gas: {
|
|
basicEstimates: {
|
|
blockTime: 14.16326530612245,
|
|
safeLow: 5,
|
|
safeLowWait: 13.2,
|
|
average: 7,
|
|
avgWait: 10.1,
|
|
fast: 10,
|
|
fastWait: 6.6,
|
|
fastest: 20,
|
|
fastestWait: 1.0,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
expectedResult: [
|
|
{
|
|
gasEstimateType: 'SLOW',
|
|
feeInSecondaryCurrency: '$0.27',
|
|
feeInPrimaryCurrency: '0.000105 ETH',
|
|
timeEstimate: '~13 min 12 sec',
|
|
priceInHexWei: '0x12a05f200',
|
|
},
|
|
{
|
|
gasEstimateType: 'AVERAGE',
|
|
feeInPrimaryCurrency: '0.000147 ETH',
|
|
feeInSecondaryCurrency: '$0.38',
|
|
priceInHexWei: '0x1a13b8600',
|
|
timeEstimate: '~10 min 6 sec',
|
|
},
|
|
{
|
|
gasEstimateType: 'FAST',
|
|
feeInSecondaryCurrency: '$0.54',
|
|
feeInPrimaryCurrency: '0.00021 ETH',
|
|
timeEstimate: '~6 min 36 sec',
|
|
priceInHexWei: '0x2540be400',
|
|
},
|
|
],
|
|
mockState: {
|
|
metamask: {
|
|
conversionRate: 2557.1,
|
|
currentCurrency: 'usd',
|
|
send: {
|
|
gasLimit: '0x5208',
|
|
},
|
|
preferences: {
|
|
showFiatInTestnets: true,
|
|
},
|
|
provider: {
|
|
type: 'rinkeby',
|
|
},
|
|
},
|
|
gas: {
|
|
basicEstimates: {
|
|
blockTime: 14.16326530612245,
|
|
safeLow: 5,
|
|
safeLowWait: 13.2,
|
|
average: 7,
|
|
avgWait: 10.1,
|
|
fast: 10,
|
|
fastWait: 6.6,
|
|
fastest: 20,
|
|
fastestWait: 1.0,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
expectedResult: [
|
|
{
|
|
gasEstimateType: 'SLOW',
|
|
feeInSecondaryCurrency: '$0.27',
|
|
feeInPrimaryCurrency: '0.000105 ETH',
|
|
timeEstimate: '~13 min 12 sec',
|
|
priceInHexWei: '0x12a05f200',
|
|
},
|
|
{
|
|
gasEstimateType: 'AVERAGE',
|
|
feeInPrimaryCurrency: '0.000147 ETH',
|
|
feeInSecondaryCurrency: '$0.38',
|
|
priceInHexWei: '0x1a13b8600',
|
|
timeEstimate: '~10 min 6 sec',
|
|
},
|
|
{
|
|
gasEstimateType: 'FAST',
|
|
feeInSecondaryCurrency: '$0.54',
|
|
feeInPrimaryCurrency: '0.00021 ETH',
|
|
timeEstimate: '~6 min 36 sec',
|
|
priceInHexWei: '0x2540be400',
|
|
},
|
|
],
|
|
mockState: {
|
|
metamask: {
|
|
conversionRate: 2557.1,
|
|
currentCurrency: 'usd',
|
|
send: {
|
|
gasLimit: '0x5208',
|
|
},
|
|
preferences: {
|
|
showFiatInTestnets: true,
|
|
},
|
|
provider: {
|
|
type: 'mainnet',
|
|
},
|
|
},
|
|
gas: {
|
|
basicEstimates: {
|
|
blockTime: 14.16326530612245,
|
|
safeLow: 5,
|
|
safeLowWait: 13.2,
|
|
average: 7,
|
|
avgWait: 10.1,
|
|
fast: 10,
|
|
fastWait: 6.6,
|
|
fastest: 20,
|
|
fastestWait: 1.0,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
]
|
|
it('should return renderable data about basic estimates', () => {
|
|
tests.forEach(test => {
|
|
assert.deepEqual(
|
|
getRenderableBasicEstimateData(test.mockState, '0x5208'),
|
|
test.expectedResult
|
|
)
|
|
})
|
|
})
|
|
|
|
})
|
|
|
|
describe('getRenderableEstimateDataForSmallButtonsFromGWEI()', () => {
|
|
const tests = [
|
|
{
|
|
expectedResult: [
|
|
{
|
|
feeInSecondaryCurrency: '$0.13',
|
|
feeInPrimaryCurrency: '0.00052 ETH',
|
|
gasEstimateType: 'SLOW',
|
|
priceInHexWei: '0x5d21dba00',
|
|
},
|
|
{
|
|
feeInSecondaryCurrency: '$0.16',
|
|
feeInPrimaryCurrency: '0.00063 ETH',
|
|
gasEstimateType: 'AVERAGE',
|
|
priceInHexWei: '0x6fc23ac00',
|
|
},
|
|
{
|
|
feeInSecondaryCurrency: '$0.27',
|
|
feeInPrimaryCurrency: '0.00105 ETH',
|
|
gasEstimateType: 'FAST',
|
|
priceInHexWei: '0xba43b7400',
|
|
},
|
|
],
|
|
mockState: {
|
|
metamask: {
|
|
conversionRate: 255.71,
|
|
currentCurrency: 'usd',
|
|
send: {
|
|
gasLimit: '0x5208',
|
|
},
|
|
preferences: {
|
|
showFiatInTestnets: false,
|
|
},
|
|
provider: {
|
|
type: 'mainnet',
|
|
},
|
|
},
|
|
gas: {
|
|
basicEstimates: {
|
|
blockTime: 14.16326530612245,
|
|
safeLow: 25,
|
|
safeLowWait: 6.6,
|
|
average: 30,
|
|
avgWait: 5.5,
|
|
fast: 50,
|
|
fastWait: 3.3,
|
|
fastest: 100,
|
|
fastestWait: 0.5,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
expectedResult: [
|
|
{
|
|
feeInSecondaryCurrency: '$2.68',
|
|
feeInPrimaryCurrency: '0.00105 ETH',
|
|
gasEstimateType: 'SLOW',
|
|
priceInHexWei: '0xba43b7400',
|
|
},
|
|
{
|
|
feeInSecondaryCurrency: '$4.03',
|
|
feeInPrimaryCurrency: '0.00157 ETH',
|
|
gasEstimateType: 'AVERAGE',
|
|
priceInHexWei: '0x1176592e00',
|
|
},
|
|
{
|
|
feeInSecondaryCurrency: '$5.37',
|
|
feeInPrimaryCurrency: '0.0021 ETH',
|
|
gasEstimateType: 'FAST',
|
|
priceInHexWei: '0x174876e800',
|
|
},
|
|
],
|
|
mockState: {
|
|
metamask: {
|
|
conversionRate: 2557.1,
|
|
currentCurrency: 'usd',
|
|
send: {
|
|
gasLimit: '0x5208',
|
|
},
|
|
preferences: {
|
|
showFiatInTestnets: false,
|
|
},
|
|
provider: {
|
|
type: 'mainnet',
|
|
},
|
|
},
|
|
gas: {
|
|
basicEstimates: {
|
|
blockTime: 14.16326530612245,
|
|
safeLow: 50,
|
|
safeLowWait: 13.2,
|
|
average: 75,
|
|
avgWait: 9.6,
|
|
fast: 100,
|
|
fastWait: 6.6,
|
|
fastest: 200,
|
|
fastestWait: 1.0,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
expectedResult: [
|
|
{
|
|
feeInSecondaryCurrency: '',
|
|
feeInPrimaryCurrency: '0.00105 ETH',
|
|
gasEstimateType: 'SLOW',
|
|
priceInHexWei: '0xba43b7400',
|
|
},
|
|
{
|
|
feeInSecondaryCurrency: '',
|
|
feeInPrimaryCurrency: '0.00157 ETH',
|
|
gasEstimateType: 'AVERAGE',
|
|
priceInHexWei: '0x1176592e00',
|
|
},
|
|
{
|
|
feeInSecondaryCurrency: '',
|
|
feeInPrimaryCurrency: '0.0021 ETH',
|
|
gasEstimateType: 'FAST',
|
|
priceInHexWei: '0x174876e800',
|
|
},
|
|
],
|
|
mockState: {
|
|
metamask: {
|
|
conversionRate: 2557.1,
|
|
currentCurrency: 'usd',
|
|
send: {
|
|
gasLimit: '0x5208',
|
|
},
|
|
preferences: {
|
|
showFiatInTestnets: false,
|
|
},
|
|
provider: {
|
|
type: 'rinkeby',
|
|
},
|
|
},
|
|
gas: {
|
|
basicEstimates: {
|
|
blockTime: 14.16326530612245,
|
|
safeLow: 50,
|
|
safeLowWait: 13.2,
|
|
average: 75,
|
|
avgWait: 9.6,
|
|
fast: 100,
|
|
fastWait: 6.6,
|
|
fastest: 200,
|
|
fastestWait: 1.0,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
expectedResult: [
|
|
{
|
|
feeInSecondaryCurrency: '$2.68',
|
|
feeInPrimaryCurrency: '0.00105 ETH',
|
|
gasEstimateType: 'SLOW',
|
|
priceInHexWei: '0xba43b7400',
|
|
},
|
|
{
|
|
feeInSecondaryCurrency: '$4.03',
|
|
feeInPrimaryCurrency: '0.00157 ETH',
|
|
gasEstimateType: 'AVERAGE',
|
|
priceInHexWei: '0x1176592e00',
|
|
},
|
|
{
|
|
feeInSecondaryCurrency: '$5.37',
|
|
feeInPrimaryCurrency: '0.0021 ETH',
|
|
gasEstimateType: 'FAST',
|
|
priceInHexWei: '0x174876e800',
|
|
},
|
|
],
|
|
mockState: {
|
|
metamask: {
|
|
conversionRate: 2557.1,
|
|
currentCurrency: 'usd',
|
|
send: {
|
|
gasLimit: '0x5208',
|
|
},
|
|
preferences: {
|
|
showFiatInTestnets: true,
|
|
},
|
|
provider: {
|
|
type: 'rinkeby',
|
|
},
|
|
},
|
|
gas: {
|
|
basicEstimates: {
|
|
blockTime: 14.16326530612245,
|
|
safeLow: 50,
|
|
safeLowWait: 13.2,
|
|
average: 75,
|
|
avgWait: 9.6,
|
|
fast: 100,
|
|
fastWait: 6.6,
|
|
fastest: 200,
|
|
fastestWait: 1.0,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
expectedResult: [
|
|
{
|
|
feeInSecondaryCurrency: '$2.68',
|
|
feeInPrimaryCurrency: '0.00105 ETH',
|
|
gasEstimateType: 'SLOW',
|
|
priceInHexWei: '0xba43b7400',
|
|
},
|
|
{
|
|
feeInSecondaryCurrency: '$4.03',
|
|
feeInPrimaryCurrency: '0.00157 ETH',
|
|
gasEstimateType: 'AVERAGE',
|
|
priceInHexWei: '0x1176592e00',
|
|
},
|
|
{
|
|
feeInSecondaryCurrency: '$5.37',
|
|
feeInPrimaryCurrency: '0.0021 ETH',
|
|
gasEstimateType: 'FAST',
|
|
priceInHexWei: '0x174876e800',
|
|
},
|
|
],
|
|
mockState: {
|
|
metamask: {
|
|
conversionRate: 2557.1,
|
|
currentCurrency: 'usd',
|
|
send: {
|
|
gasLimit: '0x5208',
|
|
},
|
|
preferences: {
|
|
showFiatInTestnets: true,
|
|
},
|
|
provider: {
|
|
type: 'mainnet',
|
|
},
|
|
},
|
|
gas: {
|
|
basicEstimates: {
|
|
blockTime: 14.16326530612245,
|
|
safeLow: 50,
|
|
safeLowWait: 13.2,
|
|
average: 75,
|
|
avgWait: 9.6,
|
|
fast: 100,
|
|
fastWait: 6.6,
|
|
fastest: 200,
|
|
fastestWait: 1.0,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
]
|
|
it('should return renderable data about basic estimates appropriate for buttons with less info', () => {
|
|
tests.forEach(test => {
|
|
assert.deepEqual(
|
|
getRenderableEstimateDataForSmallButtonsFromGWEI(test.mockState),
|
|
test.expectedResult
|
|
)
|
|
})
|
|
})
|
|
|
|
})
|
|
|
|
})
|