From da88481560f0f2ad7e12b3e94082aa10147b900e Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Tue, 28 Feb 2017 14:08:00 -0800 Subject: [PATCH] Remove gasMultiplier txMeta param This was used by the custom gas slider on the `send` screen, and it was used to modify the gas value before sending it out, breaking our new custom gas field logic. Removed it and the logic that referred to this now-outdated parameter. --- app/scripts/lib/config-manager.js | 12 ----- app/scripts/lib/id-management.js | 8 +-- app/scripts/lib/idStore.js | 1 - app/scripts/lib/tx-utils.js | 3 +- app/scripts/metamask-controller.js | 10 ---- app/scripts/transaction-manager.js | 14 +---- ui/app/actions.js | 14 ++--- ui/app/components/pending-tx-details.js | 6 +-- ui/app/send.js | 71 +------------------------ 9 files changed, 11 insertions(+), 128 deletions(-) diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js index ea5e49b19..6868637e5 100644 --- a/app/scripts/lib/config-manager.js +++ b/app/scripts/lib/config-manager.js @@ -228,18 +228,6 @@ ConfigManager.prototype._emitUpdates = function (state) { }) } -ConfigManager.prototype.getGasMultiplier = function () { - var data = this.getData() - return data.gasMultiplier -} - -ConfigManager.prototype.setGasMultiplier = function (gasMultiplier) { - var data = this.getData() - - data.gasMultiplier = gasMultiplier - this.setData(data) -} - ConfigManager.prototype.setLostAccounts = function (lostAccounts) { var data = this.getData() data.lostAccounts = lostAccounts diff --git a/app/scripts/lib/id-management.js b/app/scripts/lib/id-management.js index 421f2105f..30631d479 100644 --- a/app/scripts/lib/id-management.js +++ b/app/scripts/lib/id-management.js @@ -25,13 +25,9 @@ function IdManagement (opts) { } this.signTx = function (txParams) { - // calculate gas with custom gas multiplier - var gasMultiplier = this.configManager.getGasMultiplier() || 1 - var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice), 16) - gasPrice = gasPrice.mul(new BN(gasMultiplier * 100, 10)).div(new BN(100, 10)) - txParams.gasPrice = ethUtil.intToHex(gasPrice.toNumber()) - // normalize values + // normalize values + txParams.gasPrice = ethUtil.intToHex(txParams.gasPrice) txParams.to = ethUtil.addHexPrefix(txParams.to) txParams.from = ethUtil.addHexPrefix(txParams.from.toLowerCase()) txParams.value = ethUtil.addHexPrefix(txParams.value) diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js index 7a6968c6c..01474035e 100644 --- a/app/scripts/lib/idStore.js +++ b/app/scripts/lib/idStore.js @@ -95,7 +95,6 @@ IdentityStore.prototype.getState = function () { isUnlocked: this._isUnlocked(), seedWords: seedWords, selectedAddress: configManager.getSelectedAccount(), - gasMultiplier: configManager.getGasMultiplier(), })) } diff --git a/app/scripts/lib/tx-utils.js b/app/scripts/lib/tx-utils.js index b152effcc..19a2d430e 100644 --- a/app/scripts/lib/tx-utils.js +++ b/app/scripts/lib/tx-utils.js @@ -92,11 +92,10 @@ module.exports = class txProviderUtils { } // builds ethTx from txParams object - buildEthTxFromParams (txParams, gasMultiplier = 1) { + buildEthTxFromParams (txParams) { // apply gas multiplyer let gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice), 16) // multiply and divide by 100 so as to add percision to integer mul - gasPrice = gasPrice.mul(new BN(gasMultiplier * 100, 10)).div(new BN(100, 10)) txParams.gasPrice = ethUtil.intToHex(gasPrice.toNumber()) // normalize values txParams.to = normalize(txParams.to) diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 105bb3d19..caaa44767 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -248,7 +248,6 @@ module.exports = class MetamaskController extends EventEmitter { setProviderType: this.setProviderType.bind(this), useEtherscanProvider: this.useEtherscanProvider.bind(this), setCurrentCurrency: this.setCurrentCurrency.bind(this), - setGasMultiplier: this.setGasMultiplier.bind(this), markAccountsFound: this.markAccountsFound.bind(this), // coinbase buyEth: this.buyEth.bind(this), @@ -651,15 +650,6 @@ module.exports = class MetamaskController extends EventEmitter { this.shapeshiftController.createShapeShiftTx(depositAddress, depositType) } - setGasMultiplier (gasMultiplier, cb) { - try { - this.txManager.setGasMultiplier(gasMultiplier) - cb() - } catch (err) { - cb(err) - } - } - // // network // diff --git a/app/scripts/transaction-manager.js b/app/scripts/transaction-manager.js index eaeee2d72..07c90af7e 100644 --- a/app/scripts/transaction-manager.js +++ b/app/scripts/transaction-manager.js @@ -13,7 +13,6 @@ module.exports = class TransactionManager extends EventEmitter { super() this.store = new ObservableStore(extend({ transactions: [], - gasMultiplier: 1, }, opts.initState)) this.memStore = new ObservableStore({}) this.networkStore = opts.networkStore || new ObservableStore({}) @@ -52,14 +51,6 @@ module.exports = class TransactionManager extends EventEmitter { return fullTxList.filter(txMeta => txMeta.metamaskNetworkId === network) } - getGasMultiplier () { - return this.store.getState().gasMultiplier - } - - setGasMultiplier (gasMultiplier) { - return this.store.updateState({ gasMultiplier }) - } - // Adds a tx to the txlist addTx (txMeta) { var txList = this.getTxList() @@ -129,7 +120,6 @@ module.exports = class TransactionManager extends EventEmitter { id: txId, time: time, status: 'unapproved', - gasMultiplier: this.getGasMultiplier(), metamaskNetworkId: this.getNetwork(), txParams: txParams, } @@ -147,10 +137,8 @@ module.exports = class TransactionManager extends EventEmitter { setMaxTxCostAndFee (txMeta) { var txParams = txMeta.txParams - var gasMultiplier = txMeta.gasMultiplier var gasCost = new BN(ethUtil.stripHexPrefix(txParams.gas || txMeta.estimatedGas), 16) var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice || '0x4a817c800'), 16) - gasPrice = gasPrice.mul(new BN(gasMultiplier * 100), 10).div(new BN(100, 10)) var txFee = gasCost.mul(gasPrice) var txValue = new BN(ethUtil.stripHexPrefix(txParams.value || '0x0'), 16) var maxCost = txValue.add(txFee) @@ -210,7 +198,7 @@ module.exports = class TransactionManager extends EventEmitter { let txMeta = this.getTx(txId) let txParams = txMeta.txParams let fromAddress = txParams.from - let ethTx = this.txProviderUtils.buildEthTxFromParams(txParams, txMeta.gasMultiplier) + let ethTx = this.txProviderUtils.buildEthTxFromParams(txParams) this.signEthTx(ethTx, fromAddress).then(() => { this.setTxStatusSigned(txMeta.id) cb(null, ethUtil.bufferToHex(ethTx.serialize())) diff --git a/ui/app/actions.js b/ui/app/actions.js index b9169a106..8177696f1 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -388,17 +388,13 @@ function signPersonalMsg (msgData) { function signTx (txData) { return (dispatch) => { - log.debug(`background.setGasMultiplier`) - background.setGasMultiplier(txData.gasMultiplier, (err) => { + web3.eth.sendTransaction(txData, (err, data) => { + dispatch(actions.hideLoadingIndication()) if (err) return dispatch(actions.displayWarning(err.message)) - web3.eth.sendTransaction(txData, (err, data) => { - dispatch(actions.hideLoadingIndication()) - if (err) return dispatch(actions.displayWarning(err.message)) - dispatch(actions.hideWarning()) - dispatch(actions.goHome()) - }) - dispatch(this.showConfTxPage()) + dispatch(actions.hideWarning()) + dispatch(actions.goHome()) }) + dispatch(this.showConfTxPage()) } } diff --git a/ui/app/components/pending-tx-details.js b/ui/app/components/pending-tx-details.js index 643e69902..f5651bb1d 100644 --- a/ui/app/components/pending-tx-details.js +++ b/ui/app/components/pending-tx-details.js @@ -248,13 +248,11 @@ PTXP.miniAccountPanelForRecipient = function () { } PTXP.componentDidUpdate = function (prevProps, previousState) { + log.debug(`pending-tx-details componentDidUpdate`) const state = this.state || {} const prevState = previousState || {} const { gas, gasPrice } = state - log.debug(`pending-tx-details componentDidUpdate`) - console.log(arguments) - // Only if gas or gasPrice changed: if (!prevState || (gas !== prevState.gas || @@ -269,10 +267,8 @@ PTXP.calculateGas = function () { log.debug(`pending-tx-details calculating gas for ${JSON.stringify(txMeta)}`) var txParams = txMeta.txParams - var gasMultiplier = txMeta.gasMultiplier var gasCost = new BN(ethUtil.stripHexPrefix(txParams.gas || txMeta.estimatedGas), 16) var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice || '0x4a817c800'), 16) - gasPrice = gasPrice.mul(new BN(gasMultiplier * 100), 10).div(new BN(100, 10)) var txFee = gasCost.mul(gasPrice) var txValue = new BN(ethUtil.stripHexPrefix(txParams.value || '0x0'), 16) var maxCost = txValue.add(txFee) diff --git a/ui/app/send.js b/ui/app/send.js index d16270b41..752eed15a 100644 --- a/ui/app/send.js +++ b/ui/app/send.js @@ -208,73 +208,6 @@ SendTransactionScreen.prototype.render = function () { }, }), ]), - // custom gasPrice field - h('h3.flex-center.text-transform-uppercase', { - style: { - background: '#EBEBEB', - color: '#AEAEAE', - marginBottom: '5px', - }, - }, [ - 'Transaction Fee (optional)', - h(Tooltip, { - title: ` - This is used to set the transaction's gas price. - Setting it to 100% will use the full recommended value. `, - }, [ - h('i.fa.fa-question-circle', { - style: { - marginLeft: '5px', - }, - }), - ]), - ]), - - h('section.flex-column.flex-center', [ - h('.flex-row', [ - h(RangeSlider, { - name: 'gasInput', - options: { - mirrorInput: true, - defaultValue: 100, - min: 80, - max: 220, - }, - style: { - container: { - marginBottom: '16px', - }, - range: { - width: '68vw', - }, - input: { - width: '5em', - marginLeft: '5px', - }, - }, - }), - - h('div', { - style: { - fontSize: '12px', - paddingTop: '8px', - paddingLeft: '5px', - }, - }, '%'), - ]), - h('.flex-row', { - style: { - justifyContent: 'space-between', - width: '243px', - position: 'relative', - fontSize: '12px', - right: '42px', - bottom: '30px', - }, - }, [ - h('span', 'Cheaper'), h('span', 'Faster'), - ]), - ]), ]) ) } @@ -289,12 +222,11 @@ SendTransactionScreen.prototype.back = function () { this.props.dispatch(actions.backToAccountDetail(address)) } -SendTransactionScreen.prototype.onSubmit = function (gasPrice) { +SendTransactionScreen.prototype.onSubmit = function () { const recipient = document.querySelector('input[name="address"]').value const input = document.querySelector('input[name="amount"]').value const value = util.normalizeEthStringToWei(input) const txData = document.querySelector('input[name="txData"]').value - const gasMultiplier = document.querySelector('input[name="gasInput"]').value const balance = this.props.balance let message @@ -323,7 +255,6 @@ SendTransactionScreen.prototype.onSubmit = function (gasPrice) { var txParams = { from: this.props.address, value: '0x' + value.toString(16), - gasMultiplier: gasMultiplier * 0.01, } if (recipient) txParams.to = ethUtil.addHexPrefix(recipient)