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

Resolve merge conflicts.

Browse Source
This commit is contained in:
Kevin Serrano 2016-11-15 13:39:42 -08:00
commit 64296df309
No known key found for this signature in database
GPG Key ID: 7CC862A58D2889B4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@
## Current Master ## Current Master
- Show a warning when a transaction fails during simulation. - Show a warning when a transaction fails during simulation.
- Fix bug where 20% of gas estimate was not being added properly. - Fix bug where 20% of gas estimate was not being added properly.
- Render error messages in our confirmation screen more gracefully.
## 2.13.7 2016-11-8 ## 2.13.7 2016-11-8

8
app/scripts/lib/idStore.js
View File

@ -246,7 +246,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
function analyzeForDelegateCall (cb) { function analyzeForDelegateCall (cb) {
if (txParams.to) { if (txParams.to) {
query.getCode(txParams.to, (err, result) => { query.getCode(txParams.to, (err, result) => {
if (err) return cb(err) if (err) return cb(err.message || err)
var containsDelegateCall = self.checkForDelegateCall(result) var containsDelegateCall = self.checkForDelegateCall(result)
txData.containsDelegateCall = containsDelegateCall txData.containsDelegateCall = containsDelegateCall
cb() cb()
@ -261,8 +261,8 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
// 1 billion gas for estimation // 1 billion gas for estimation
var gasLimit = '0x3b9aca00' var gasLimit = '0x3b9aca00'
estimationParams.gas = gasLimit estimationParams.gas = gasLimit
query.estimateGas(estimationParams, function (err, result) { query.estimateGas(estimationParams, function(err, result){
if (err) return cb(err) if (err) return cb(err.message || err)
if (result === estimationParams.gas) { if (result === estimationParams.gas) {
txData.simulationFails = true txData.simulationFails = true
query.getBlockByNumber('latest', true, function (err, block) { query.getBlockByNumber('latest', true, function (err, block) {
@ -280,7 +280,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
} }
function didComplete (err) { function didComplete (err) {
if (err) return cb(err) if (err) return cb(err.message || err)
configManager.addTx(txData) configManager.addTx(txData)
// signal update // signal update
self._didUpdate() self._didUpdate()

1
app/scripts/metamask-controller.js
View File

@ -199,7 +199,6 @@ module.exports = class MetamaskController {
newUnsignedTransaction (txParams, onTxDoneCb) { newUnsignedTransaction (txParams, onTxDoneCb) {
const keyringController = this.keyringController const keyringController = this.keyringController
const err = this.enforceTxValidations(txParams) const err = this.enforceTxValidations(txParams)
if (err) return onTxDoneCb(err) if (err) return onTxDoneCb(err)
keyringController.addUnconfirmedTransaction(txParams, onTxDoneCb, (err, txData) => { keyringController.addUnconfirmedTransaction(txParams, onTxDoneCb, (err, txData) => {