From 165666b315c0a6d4b2b03f6b8858e8e24c5ea1d2 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Fri, 1 May 2020 08:44:05 -0300 Subject: [PATCH] Remove unnecessary tx meta properties (#8489) * Remove `estimatedGas` property from `txMeta` The `estimatedGas` property was a cache of the gas value estimated for a transaction when the default gas limit was set. This property wasn't used anywhere. It may have been useful for debugging purposes, but the same gas estimate is already stored on the `history` property so it should be present in state logs regardless. * Remove `gasLimitSpecified` txMeta property The `gasLimitSpecified` property of `txMeta` wasn't used for anything. It might have been useful for debugging purposes, but whether or not the gas limit was specified can also be determined from looking at the transaction history, so it's not a huge loss. * Remove `gasPriceSpecified` txMeta property The `gasPriceSpecified` property of `txMeta` wasn't used for anything. It might have been useful for debugging purposes, but whether or not the gas price was specified can also be determined from looking at the transaction history, so it's not a huge loss. * Remove `simpleSend` txMeta property The `simpleSend` property of `txMeta` was used to ensure a buffer was not added to the gas limit during gas estimation for simple send transactions. It was made redundant by #8484, which accomplishes this without the use of this property. --- app/scripts/background.js | 3 - .../controllers/transactions/README.md | 3 - app/scripts/controllers/transactions/index.js | 6 - .../controllers/transactions/tx-gas-utils.js | 3 +- development/states/tx-list-items.json | 132 +------- test/data/mock-state.json | 138 -------- test/data/v17-long-history.json | 306 ++---------------- test/lib/migrations/004.json | 6 - test/unit/app/controllers/network/stubs.js | 18 -- .../transaction-activity-log.util.test.js | 16 - .../confirm-transaction.duck.test.js | 12 - .../send/tests/send-selectors-test-data.js | 2 - .../pages/send/tests/send-selectors.test.js | 2 - ui/app/selectors/tests/selectors-test-data.js | 2 - 14 files changed, 35 insertions(+), 614 deletions(-) diff --git a/app/scripts/background.js b/app/scripts/background.js index fd020933e..9016a3944 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -84,9 +84,6 @@ initialize().catch(log.error) * @property {boolean} loadingDefaults - TODO: Document * @property {Object} txParams - The tx params as passed to the network provider. * @property {Object[]} history - A history of mutations to this TransactionMeta object. - * @property {boolean} gasPriceSpecified - True if the suggesting dapp specified a gas price, prevents auto-estimation. - * @property {boolean} gasLimitSpecified - True if the suggesting dapp specified a gas limit, prevents auto-estimation. - * @property {string} estimatedGas - A hex string represented the estimated gas limit required to complete the transaction. * @property {string} origin - A string representing the interface that suggested the transaction. * @property {Object} nonceDetails - A metadata object containing information used to derive the suggested nonce, useful for debugging nonce issues. * @property {string} rawTx - A hex string of the final signed transaction, ready to submit to the network. diff --git a/app/scripts/controllers/transactions/README.md b/app/scripts/controllers/transactions/README.md index b414762dc..f27bb04ae 100644 --- a/app/scripts/controllers/transactions/README.md +++ b/app/scripts/controllers/transactions/README.md @@ -59,9 +59,6 @@ txMeta = { "value": "0x3b9aca00" }, ...], // I've removed most of history for this - "gasPriceSpecified": false, //whether or not the user/dapp has specified gasPrice - "gasLimitSpecified": false, //whether or not the user/dapp has specified gas - "estimatedGas": "5208", "origin": "MetaMask", //debug "nonceDetails": { "params": { diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js index fb775da12..55ce06989 100644 --- a/app/scripts/controllers/transactions/index.js +++ b/app/scripts/controllers/transactions/index.js @@ -268,7 +268,6 @@ export default class TransactionController extends EventEmitter { async addTxGasDefaults (txMeta, getCodeResponse) { const txParams = txMeta.txParams - txMeta.gasPriceSpecified = Boolean(txParams.gasPrice) let gasPrice = txParams.gasPrice if (!gasPrice) { gasPrice = this.getGasPrice ? this.getGasPrice() : await this.query.gasPrice() @@ -278,8 +277,6 @@ export default class TransactionController extends EventEmitter { // set gasLimit if (txParams.gas) { - txMeta.estimatedGas = txParams.gas - txMeta.gasLimitSpecified = Boolean(txParams.gas) return txMeta } else if ( txParams.to && @@ -298,9 +295,6 @@ export default class TransactionController extends EventEmitter { // This is a standard ether simple send, gas requirement is exactly 21k txParams.gas = SIMPLE_GAS_COST - txMeta.estimatedGas = SIMPLE_GAS_COST - txMeta.simpleSend = true - txMeta.gasLimitSpecified = Boolean(txParams.gas) return txMeta } diff --git a/app/scripts/controllers/transactions/tx-gas-utils.js b/app/scripts/controllers/transactions/tx-gas-utils.js index a05f64ee5..968bfaa3f 100644 --- a/app/scripts/controllers/transactions/tx-gas-utils.js +++ b/app/scripts/controllers/transactions/tx-gas-utils.js @@ -72,12 +72,11 @@ export default class TxGasUtil { @param {string} estimatedGasHex - the estimated gas hex */ setTxGas (txMeta, blockGasLimitHex, estimatedGasHex) { - txMeta.estimatedGas = addHexPrefix(estimatedGasHex) const txParams = txMeta.txParams // if gasLimit not originally specified, // try adding an additional gas buffer to our estimation for safety - const recommendedGasHex = this.addGasBuffer(txMeta.estimatedGas, blockGasLimitHex) + const recommendedGasHex = this.addGasBuffer(addHexPrefix(estimatedGasHex), blockGasLimitHex) txParams.gas = recommendedGasHex return } diff --git a/development/states/tx-list-items.json b/development/states/tx-list-items.json index 560313a8b..53b274c71 100644 --- a/development/states/tx-list-items.json +++ b/development/states/tx-list-items.json @@ -76,9 +76,6 @@ "message": "Error: intrinsic gas too low", "stack": "Error: some error" }, - "estimatedGas": "0xcf08", - "gasLimitSpecified": true, - "gasPriceSpecified": true, "history": [ { "id": 4068311466147836, @@ -99,21 +96,6 @@ "op": "replace", "path": "/loadingDefaults", "value": false - }, - { - "op": "add", - "path": "/gasPriceSpecified", - "value": true - }, - { - "op": "add", - "path": "/gasLimitSpecified", - "value": true - }, - { - "op": "add", - "path": "/estimatedGas", - "value": "0xcf08" } ], [ @@ -270,21 +252,6 @@ "op": "replace", "path": "/loadingDefaults", "value": false - }, - { - "op": "add", - "path": "/gasPriceSpecified", - "value": true - }, - { - "op": "add", - "path": "/gasLimitSpecified", - "value": true - }, - { - "op": "add", - "path": "/estimatedGas", - "value": "0xcf08" } ], [ @@ -303,16 +270,10 @@ "note": "txStateManager: setting status to approved" } ] - ], - "gasPriceSpecified": true, - "gasLimitSpecified": true, - "estimatedGas": "0xcf08" + ] }, { - "estimatedGas": "8d41", "firstRetryBlockNumber": "0x2cbc70", - "gasLimitSpecified": false, - "gasPriceSpecified": false, "hash": "0xfbd997bf9bb85ca1598952ca23e7910502d527e06cb6ee1bbe7e7dd59d6909cd", "history": [ { @@ -347,21 +308,6 @@ "op": "replace", "path": "/loadingDefaults", "value": false - }, - { - "op": "add", - "path": "/gasPriceSpecified", - "value": false - }, - { - "op": "add", - "path": "/gasLimitSpecified", - "value": false - }, - { - "op": "add", - "path": "/estimatedGas", - "value": "8d41" } ], [ @@ -517,10 +463,7 @@ } }, { - "estimatedGas": "8d41", "firstRetryBlockNumber": "0x2cbc70", - "gasLimitSpecified": false, - "gasPriceSpecified": false, "hash": "0xfbd997bf9bb85ca1598952ca23e7910502d527e06cb6ee1bbe7e7dd59d6909cd", "history": [ { @@ -555,21 +498,6 @@ "op": "replace", "path": "/loadingDefaults", "value": false - }, - { - "op": "add", - "path": "/gasPriceSpecified", - "value": false - }, - { - "op": "add", - "path": "/gasLimitSpecified", - "value": false - }, - { - "op": "add", - "path": "/estimatedGas", - "value": "8d41" } ], [ @@ -759,21 +687,6 @@ "op": "replace", "path": "/loadingDefaults", "value": false - }, - { - "op": "add", - "path": "/gasPriceSpecified", - "value": true - }, - { - "op": "add", - "path": "/gasLimitSpecified", - "value": true - }, - { - "op": "add", - "path": "/estimatedGas", - "value": "0xcf08" } ], [], @@ -873,9 +786,6 @@ } ] ], - "gasPriceSpecified": true, - "gasLimitSpecified": true, - "estimatedGas": "0xcf08", "nonceDetails": { "params": { "highestLocalNonce": 3, @@ -936,27 +846,9 @@ "op": "replace", "path": "/loadingDefaults", "value": false - }, - { - "op": "add", - "path": "/gasPriceSpecified", - "value": true - }, - { - "op": "add", - "path": "/gasLimitSpecified", - "value": true - }, - { - "op": "add", - "path": "/estimatedGas", - "value": "0xcf08" } ] - ], - "gasPriceSpecified": true, - "gasLimitSpecified": true, - "estimatedGas": "0xcf08" + ] } ], "unapprovedTxs": { @@ -993,27 +885,9 @@ "op": "replace", "path": "/loadingDefaults", "value": false - }, - { - "op": "add", - "path": "/gasPriceSpecified", - "value": true - }, - { - "op": "add", - "path": "/gasLimitSpecified", - "value": true - }, - { - "op": "add", - "path": "/estimatedGas", - "value": "0xcf08" } ] - ], - "gasPriceSpecified": true, - "gasLimitSpecified": true, - "estimatedGas": "0xcf08" + ] } }, "unapprovedMsgs": { diff --git a/test/data/mock-state.json b/test/data/mock-state.json index df6b7402b..a70bf1efe 100644 --- a/test/data/mock-state.json +++ b/test/data/mock-state.json @@ -51,21 +51,6 @@ "path": "/loadingDefaults", "value": false, "timestamp": 1536268017685 - }, - { - "op": "add", - "path": "/gasPriceSpecified", - "value": true - }, - { - "op": "add", - "path": "/gasLimitSpecified", - "value": true - }, - { - "op": "add", - "path": "/estimatedGas", - "value": "0x5208" } ], [ @@ -78,9 +63,6 @@ } ] ], - "gasPriceSpecified": true, - "gasLimitSpecified": true, - "estimatedGas": "0x5208", "origin": "MetaMask" } }, @@ -193,21 +175,6 @@ "path": "/loadingDefaults", "value": false, "timestamp": 1528133130666 - }, - { - "op": "add", - "path": "/gasPriceSpecified", - "value": true - }, - { - "op": "add", - "path": "/gasLimitSpecified", - "value": true - }, - { - "op": "add", - "path": "/estimatedGas", - "value": "0xcf08" } ], [ @@ -325,9 +292,6 @@ } ] ], - "gasPriceSpecified": true, - "gasLimitSpecified": true, - "estimatedGas": "0xcf08", "origin": "MetaMask", "nonceDetails": { "params": { @@ -391,21 +355,6 @@ "path": "/loadingDefaults", "value": false, "timestamp": 1528133150011 - }, - { - "op": "add", - "path": "/gasPriceSpecified", - "value": true - }, - { - "op": "add", - "path": "/gasLimitSpecified", - "value": true - }, - { - "op": "add", - "path": "/estimatedGas", - "value": "0xcf08" } ], [ @@ -523,9 +472,6 @@ } ] ], - "gasPriceSpecified": true, - "gasLimitSpecified": true, - "estimatedGas": "0xcf08", "origin": "MetaMask", "nonceDetails": { "params": { @@ -589,21 +535,6 @@ "path": "/loadingDefaults", "value": false, "timestamp": 1528133180720 - }, - { - "op": "add", - "path": "/gasPriceSpecified", - "value": true - }, - { - "op": "add", - "path": "/gasLimitSpecified", - "value": true - }, - { - "op": "add", - "path": "/estimatedGas", - "value": "0xcf08" } ], [ @@ -721,9 +652,6 @@ } ] ], - "gasPriceSpecified": true, - "gasLimitSpecified": true, - "estimatedGas": "0xcf08", "origin": "MetaMask", "nonceDetails": { "params": { @@ -793,32 +721,11 @@ "op": "replace", "path": "/loadingDefaults", "value": false - }, - { - "op": "add", - "path": "/gasPriceSpecified", - "value": true - }, - { - "op": "add", - "path": "/gasLimitSpecified", - "value": false - }, - { - "op": "add", - "path": "/estimatedGas", - "value": "40f14" } ], [ { - "op": "replace", - "path": "/estimatedGas", - "value": "40f14", "note": "#newUnapprovedTransaction - adding the origin", - "timestamp": 1528133225492 - }, - { "op": "add", "path": "/origin", "value": "crypko.ai" @@ -930,9 +837,6 @@ } ] ], - "gasPriceSpecified": true, - "gasLimitSpecified": false, - "estimatedGas": "40f14", "origin": "crypko.ai", "nonceDetails": { "params": { @@ -998,21 +902,6 @@ "path": "/loadingDefaults", "value": false, "timestamp": 1528133291486 - }, - { - "op": "add", - "path": "/gasPriceSpecified", - "value": true - }, - { - "op": "add", - "path": "/gasLimitSpecified", - "value": true - }, - { - "op": "add", - "path": "/estimatedGas", - "value": "0xd508" } ], [ @@ -1130,9 +1019,6 @@ } ] ], - "gasPriceSpecified": true, - "gasLimitSpecified": true, - "estimatedGas": "0xd508", "origin": "MetaMask", "nonceDetails": { "params": { @@ -1207,26 +1093,6 @@ "op": "replace", "path": "/loadingDefaults", "value": false - }, - { - "op": "add", - "path": "/gasPriceSpecified", - "value": false - }, - { - "op": "add", - "path": "/gasLimitSpecified", - "value": false - }, - { - "op": "add", - "path": "/simpleSend", - "value": true - }, - { - "op": "add", - "path": "/estimatedGas", - "value": "0x5208" } ], [ @@ -1248,10 +1114,6 @@ } ] ], - "gasPriceSpecified": false, - "gasLimitSpecified": false, - "simpleSend": true, - "estimatedGas": "0x5208", "origin": "tmashuang.github.io" } ] diff --git a/test/data/v17-long-history.json b/test/data/v17-long-history.json index 68256ee4e..d0333b969 100644 --- a/test/data/v17-long-history.json +++ b/test/data/v17-long-history.json @@ -390,9 +390,7 @@ "value": "0x0", "gasPrice": "3b9aca00", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038869, @@ -405,9 +403,7 @@ "value": "0x0", "gasPrice": "3b9aca00", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038869, @@ -420,9 +416,7 @@ "value": "0x0", "gasPrice": "3b9aca00", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038869, @@ -435,9 +429,7 @@ "value": "0x0", "gasPrice": "3b9aca00", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038869, @@ -452,8 +444,6 @@ "gas": "0x7b0d", "nonce": 0 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16643c", "baseCount": 0, @@ -474,8 +464,6 @@ "gas": "0x7b0d", "nonce": 0 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16643c", "baseCount": 0, @@ -496,8 +484,6 @@ "gas": "0x7b0d", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16643c", "baseCount": 0, @@ -518,8 +504,6 @@ "gas": "0x7b0d", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16643c", "baseCount": 0, @@ -540,8 +524,6 @@ "gas": "0x7b0d", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16643c", "baseCount": 0, @@ -563,8 +545,6 @@ "gas": "0x7b0d", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16643c", "baseCount": 0, @@ -586,8 +566,6 @@ "gas": "0x7b0d", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16643c", "baseCount": 0, @@ -610,8 +588,6 @@ "gas": "0x7b0d", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16643c", "baseCount": 0, @@ -634,8 +610,6 @@ "gas": "0x7b0d", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16643c", "baseCount": 0, @@ -658,8 +632,6 @@ "gas": "0x7b0d", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16643c", "baseCount": 0, @@ -682,8 +654,6 @@ "gas": "0x7b0d", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16643c", "baseCount": 0, @@ -707,8 +677,6 @@ "gas": "0x7b0d", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16643c", "baseCount": 0, @@ -720,8 +688,6 @@ "retryCount": 1 } ], - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16643c", "baseCount": 0, @@ -756,9 +722,7 @@ "value": "0x0", "gasPrice": "28fa6ae00", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038870, @@ -771,13 +735,9 @@ "value": "0x0", "gasPrice": "28fa6ae00", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } } - ], - "gasLimitSpecified": false, - "estimatedGas": "5209" + ] }, { "id": 6616756286038871, @@ -805,9 +765,7 @@ "value": "0x0", "gasPrice": "28fa6ae00", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038871, @@ -820,9 +778,7 @@ "value": "0x0", "gasPrice": "28fa6ae00", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038871, @@ -835,9 +791,7 @@ "value": "0x0", "gasPrice": "28fa6ae00", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038871, @@ -850,9 +804,7 @@ "value": "0x0", "gasPrice": "28fa6ae00", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038871, @@ -867,8 +819,6 @@ "gas": "0x7b0d", "nonce": 1 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x168739", "baseCount": 1, @@ -889,8 +839,6 @@ "gas": "0x7b0d", "nonce": 1 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x168739", "baseCount": 1, @@ -912,8 +860,6 @@ "nonce": "0x01", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x168739", "baseCount": 1, @@ -935,8 +881,6 @@ "nonce": "0x01", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x168739", "baseCount": 1, @@ -958,8 +902,6 @@ "nonce": "0x01", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x168739", "baseCount": 1, @@ -982,8 +924,6 @@ "nonce": "0x01", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x168739", "baseCount": 1, @@ -1006,8 +946,6 @@ "nonce": "0x01", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x168739", "baseCount": 1, @@ -1031,8 +969,6 @@ "nonce": "0x01", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x168739", "baseCount": 1, @@ -1056,8 +992,6 @@ "nonce": "0x01", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x168739", "baseCount": 1, @@ -1081,8 +1015,6 @@ "nonce": "0x01", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x168739", "baseCount": 1, @@ -1106,8 +1038,6 @@ "nonce": "0x01", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x168739", "baseCount": 1, @@ -1132,8 +1062,6 @@ "nonce": "0x01", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x168739", "baseCount": 1, @@ -1145,8 +1073,6 @@ "retryCount": 1 } ], - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x168739", "baseCount": 1, @@ -1183,9 +1109,7 @@ "value": "0x0", "gasPrice": "4a817c800", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038872, @@ -1198,9 +1122,7 @@ "value": "0x0", "gasPrice": "4a817c800", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038872, @@ -1213,9 +1135,7 @@ "value": "0x0", "gasPrice": "4a817c800", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038872, @@ -1228,9 +1148,7 @@ "value": "0x0", "gasPrice": "4a817c800", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038872, @@ -1245,8 +1163,6 @@ "gas": "0x7b0d", "nonce": 2 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b066", "baseCount": 2, @@ -1267,8 +1183,6 @@ "gas": "0x7b0d", "nonce": 2 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b066", "baseCount": 2, @@ -1290,8 +1204,6 @@ "nonce": "0x02", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b066", "baseCount": 2, @@ -1313,8 +1225,6 @@ "nonce": "0x02", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b066", "baseCount": 2, @@ -1336,8 +1246,6 @@ "nonce": "0x02", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b066", "baseCount": 2, @@ -1360,8 +1268,6 @@ "nonce": "0x02", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b066", "baseCount": 2, @@ -1384,8 +1290,6 @@ "nonce": "0x02", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b066", "baseCount": 2, @@ -1409,8 +1313,6 @@ "nonce": "0x02", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b066", "baseCount": 2, @@ -1434,8 +1336,6 @@ "nonce": "0x02", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b066", "baseCount": 2, @@ -1459,8 +1359,6 @@ "nonce": "0x02", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b066", "baseCount": 2, @@ -1484,8 +1382,6 @@ "nonce": "0x02", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b066", "baseCount": 2, @@ -1510,8 +1406,6 @@ "nonce": "0x02", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b066", "baseCount": 2, @@ -1523,8 +1417,6 @@ "retryCount": 1 } ], - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b066", "baseCount": 2, @@ -1561,9 +1453,7 @@ "value": "0x0", "gasPrice": "0x3b9aca00", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038873, @@ -1576,9 +1466,7 @@ "value": "0x0", "gasPrice": "0x3b9aca00", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038873, @@ -1591,9 +1479,7 @@ "value": "0x0", "gasPrice": "0x3b9aca00", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038873, @@ -1606,9 +1492,7 @@ "value": "0x0", "gasPrice": "0x3b9aca00", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038873, @@ -1623,8 +1507,6 @@ "gas": "0x7b0d", "nonce": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -1645,8 +1527,6 @@ "gas": "0x7b0d", "nonce": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -1668,8 +1548,6 @@ "nonce": "0x03", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -1691,8 +1569,6 @@ "nonce": "0x03", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -1714,8 +1590,6 @@ "nonce": "0x03", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -1738,8 +1612,6 @@ "nonce": "0x03", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -1762,8 +1634,6 @@ "nonce": "0x03", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -1787,8 +1657,6 @@ "nonce": "0x03", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -1812,8 +1680,6 @@ "nonce": "0x03", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -1837,8 +1703,6 @@ "nonce": "0x03", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -1862,8 +1726,6 @@ "nonce": "0x03", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -1888,8 +1750,6 @@ "nonce": "0x03", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -1901,8 +1761,6 @@ "retryCount": 2 } ], - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -1939,9 +1797,7 @@ "value": "0x0", "gasPrice": "4a817c800", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038874, @@ -1954,9 +1810,7 @@ "value": "0x0", "gasPrice": "4a817c800", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038874, @@ -1969,9 +1823,7 @@ "value": "0x0", "gasPrice": "4a817c800", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038874, @@ -1984,9 +1836,7 @@ "value": "0x0", "gasPrice": "4a817c800", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038874, @@ -2001,8 +1851,6 @@ "gas": "0x7b0d", "nonce": 4 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -2023,8 +1871,6 @@ "gas": "0x7b0d", "nonce": 4 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -2046,8 +1892,6 @@ "nonce": "0x04", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -2069,8 +1913,6 @@ "nonce": "0x04", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -2092,8 +1934,6 @@ "nonce": "0x04", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -2116,8 +1956,6 @@ "nonce": "0x04", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -2140,8 +1978,6 @@ "nonce": "0x04", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -2165,8 +2001,6 @@ "nonce": "0x04", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -2190,8 +2024,6 @@ "nonce": "0x04", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -2215,8 +2047,6 @@ "nonce": "0x04", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -2240,8 +2070,6 @@ "nonce": "0x04", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -2266,8 +2094,6 @@ "nonce": "0x04", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -2279,8 +2105,6 @@ "retryCount": 4 } ], - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b067", "baseCount": 2, @@ -2317,9 +2141,7 @@ "value": "0x0", "gasPrice": "4a817c800", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038875, @@ -2332,9 +2154,7 @@ "value": "0x0", "gasPrice": "4a817c800", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038875, @@ -2347,9 +2167,7 @@ "value": "0x0", "gasPrice": "4a817c800", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038875, @@ -2362,9 +2180,7 @@ "value": "0x0", "gasPrice": "4a817c800", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038875, @@ -2379,8 +2195,6 @@ "gas": "0x7b0d", "nonce": 5 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2401,8 +2215,6 @@ "gas": "0x7b0d", "nonce": 5 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2424,8 +2236,6 @@ "nonce": "0x05", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2447,8 +2257,6 @@ "nonce": "0x05", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2470,8 +2278,6 @@ "nonce": "0x05", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2494,8 +2300,6 @@ "nonce": "0x05", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2518,8 +2322,6 @@ "nonce": "0x05", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2543,8 +2345,6 @@ "nonce": "0x05", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2568,8 +2368,6 @@ "nonce": "0x05", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2593,8 +2391,6 @@ "nonce": "0x05", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2618,8 +2414,6 @@ "nonce": "0x05", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2644,8 +2438,6 @@ "nonce": "0x05", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2657,8 +2449,6 @@ "retryCount": 3 } ], - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2695,9 +2485,7 @@ "value": "0x0", "gasPrice": "4a817c800", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038876, @@ -2710,9 +2498,7 @@ "value": "0x0", "gasPrice": "4a817c800", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038876, @@ -2725,9 +2511,7 @@ "value": "0x0", "gasPrice": "4a817c800", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038876, @@ -2740,9 +2524,7 @@ "value": "0x0", "gasPrice": "4a817c800", "gas": "0x7b0d" - }, - "gasLimitSpecified": false, - "estimatedGas": "5209" + } }, { "id": 6616756286038876, @@ -2757,8 +2539,6 @@ "gas": "0x7b0d", "nonce": 6 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2779,8 +2559,6 @@ "gas": "0x7b0d", "nonce": 6 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2802,8 +2580,6 @@ "nonce": "0x06", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2825,8 +2601,6 @@ "nonce": "0x06", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2848,8 +2622,6 @@ "nonce": "0x06", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2872,8 +2644,6 @@ "nonce": "0x06", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2896,8 +2666,6 @@ "nonce": "0x06", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2921,8 +2689,6 @@ "nonce": "0x06", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2946,8 +2712,6 @@ "nonce": "0x06", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2971,8 +2735,6 @@ "nonce": "0x06", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -2996,8 +2758,6 @@ "nonce": "0x06", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -3022,8 +2782,6 @@ "nonce": "0x06", "chainId": 3 }, - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, @@ -3035,8 +2793,6 @@ "retryCount": 5 } ], - "gasLimitSpecified": false, - "estimatedGas": "5209", "nonceDetails": { "blockNumber": "0x16b068", "baseCount": 3, diff --git a/test/lib/migrations/004.json b/test/lib/migrations/004.json index a6487c1e2..214bb3910 100644 --- a/test/lib/migrations/004.json +++ b/test/lib/migrations/004.json @@ -88,8 +88,6 @@ "nonce":"0x0", "gasLimit":"0x5209" }, - "gasLimitSpecified":false, - "estimatedGas":"0x5209", "txFee":"17e0186e60800", "txValue":"de0b6b3a7640000", "maxCost":"de234b52e4a0800", @@ -112,8 +110,6 @@ "gasPrice":"0x04a817c800", "gasLimit":"0x5209" }, - "gasLimitSpecified":false, - "estimatedGas":"0x5209", "txFee":"17e0186e60800", "txValue":"de0b6b3a7640000", "maxCost":"de234b52e4a0800", @@ -133,8 +129,6 @@ "metamaskNetworkId":"3", "gas":"0x5209" }, - "gasLimitSpecified":false, - "estimatedGas":"0x5209", "txFee":"17e0186e60800", "txValue":"de0b6b3a7640000", "maxCost":"de234b52e4a0800" diff --git a/test/unit/app/controllers/network/stubs.js b/test/unit/app/controllers/network/stubs.js index d63e782bc..074e5e2c6 100644 --- a/test/unit/app/controllers/network/stubs.js +++ b/test/unit/app/controllers/network/stubs.js @@ -7,10 +7,7 @@ export default {} // for pending middlewares test export const txMetaStub = { - 'estimatedGas': '0x5208', 'firstRetryBlockNumber': '0x51a402', - 'gasLimitSpecified': true, - 'gasPriceSpecified': true, 'hash': '0x2cc5a25744486f7383edebbf32003e5a66e18135799593d6b5cdd2bb43674f09', 'history': [ { @@ -36,21 +33,6 @@ export const txMetaStub = { 'timestamp': 1572395156645, 'value': false, }, - { - 'op': 'add', - 'path': '/gasPriceSpecified', - 'value': true, - }, - { - 'op': 'add', - 'path': '/gasLimitSpecified', - 'value': true, - }, - { - 'op': 'add', - 'path': '/estimatedGas', - 'value': '0x5208', - }, ], [ { diff --git a/ui/app/components/app/transaction-activity-log/tests/transaction-activity-log.util.test.js b/ui/app/components/app/transaction-activity-log/tests/transaction-activity-log.util.test.js index a5912fbe8..a21c8c102 100644 --- a/ui/app/components/app/transaction-activity-log/tests/transaction-activity-log.util.test.js +++ b/ui/app/components/app/transaction-activity-log/tests/transaction-activity-log.util.test.js @@ -10,7 +10,6 @@ describe('TransactionActivityLog utils', function () { it('should return activities for an array of transactions', function () { const transactions = [ { - estimatedGas: '0x5208', hash: '0xa14f13d36b3901e352ce3a7acb9b47b001e5a3370f06232a0953c6fc6fad91b3', history: [ { @@ -171,21 +170,6 @@ describe('TransactionActivityLog utils', function () { timestamp: 1535507561515, value: false, }, - { - op: 'add', - path: '/gasPriceSpecified', - value: true, - }, - { - op: 'add', - path: '/gasLimitSpecified', - value: true, - }, - { - op: 'add', - path: '/estimatedGas', - value: '0x5208', - }, ], [ { diff --git a/ui/app/ducks/confirm-transaction/confirm-transaction.duck.test.js b/ui/app/ducks/confirm-transaction/confirm-transaction.duck.test.js index 606e989d6..52c9301d3 100644 --- a/ui/app/ducks/confirm-transaction/confirm-transaction.duck.test.js +++ b/ui/app/ducks/confirm-transaction/confirm-transaction.duck.test.js @@ -514,15 +514,11 @@ describe('Confirm Transaction Duck', function () { tokenSymbol: '', }, txData: { - estimatedGas: '0x5208', - gasLimitSpecified: false, - gasPriceSpecified: false, history: [], id: 2603411941761054, loadingDefaults: false, metamaskNetworkId: '3', origin: 'faucet.metamask.io', - simpleSend: true, status: 'unapproved', time: 1530838113716, }, @@ -548,15 +544,11 @@ describe('Confirm Transaction Duck', function () { it('updates txData and updates gas values in confirmTransaction', function () { const txData = { - estimatedGas: '0x5208', - gasLimitSpecified: false, - gasPriceSpecified: false, history: [], id: 2603411941761054, loadingDefaults: false, metamaskNetworkId: '3', origin: 'faucet.metamask.io', - simpleSend: true, status: 'unapproved', time: 1530838113716, txParams: { @@ -622,15 +614,11 @@ describe('Confirm Transaction Duck', function () { network: '3', unapprovedTxs: { 2603411941761054: { - estimatedGas: '0x5208', - gasLimitSpecified: false, - gasPriceSpecified: false, history: [], id: 2603411941761054, loadingDefaults: false, metamaskNetworkId: '3', origin: 'faucet.metamask.io', - simpleSend: true, status: 'unapproved', time: 1530838113716, txParams: { diff --git a/ui/app/pages/send/tests/send-selectors-test-data.js b/ui/app/pages/send/tests/send-selectors-test-data.js index 72b2aa96b..b440f0a98 100644 --- a/ui/app/pages/send/tests/send-selectors-test-data.js +++ b/ui/app/pages/send/tests/send-selectors-test-data.js @@ -193,8 +193,6 @@ export default { 'metamaskNetworkId': '3', 'gas': '0x5209', }, - 'gasLimitSpecified': false, - 'estimatedGas': '0x5209', 'txFee': '17e0186e60800', 'txValue': 'de0b6b3a7640000', 'maxCost': 'de234b52e4a0800', diff --git a/ui/app/pages/send/tests/send-selectors.test.js b/ui/app/pages/send/tests/send-selectors.test.js index 98f63c94c..aaada09ed 100644 --- a/ui/app/pages/send/tests/send-selectors.test.js +++ b/ui/app/pages/send/tests/send-selectors.test.js @@ -511,8 +511,6 @@ describe('send selectors', function () { metamaskNetworkId: '3', gas: '0x5209', }, - gasLimitSpecified: false, - estimatedGas: '0x5209', txFee: '17e0186e60800', txValue: 'de0b6b3a7640000', maxCost: 'de234b52e4a0800', diff --git a/ui/app/selectors/tests/selectors-test-data.js b/ui/app/selectors/tests/selectors-test-data.js index 9ac3eb704..9cede8177 100644 --- a/ui/app/selectors/tests/selectors-test-data.js +++ b/ui/app/selectors/tests/selectors-test-data.js @@ -194,8 +194,6 @@ export default { 'metamaskNetworkId': '3', 'gas': '0x5209', }, - 'gasLimitSpecified': false, - 'estimatedGas': '0x5209', 'txFee': '17e0186e60800', 'txValue': 'de0b6b3a7640000', 'maxCost': 'de234b52e4a0800',