feature/default_network_editable
Kevin Serrano 8 years ago
parent 20c043a4c2
commit e9bea92ac3
No known key found for this signature in database
GPG Key ID: 7CC862A58D2889B4
  1. 3
      app/scripts/keyring-controller.js
  2. 4
      app/scripts/lib/idStore.js
  3. 4
      ui/app/actions.js

@ -73,7 +73,7 @@ module.exports = class KeyringController extends EventEmitter {
// or accept a state-resolving promise to consume their results.
//
// Not all methods end with this, that might be a nice refactor.
fullUpdate() {
fullUpdate () {
this.emit('update')
return Promise.resolve(this.getState())
}
@ -586,7 +586,6 @@ module.exports = class KeyringController extends EventEmitter {
// Attempts to sign the provided @object msgParams.
signMessage (msgParams, cb) {
try {
const msgId = msgParams.metamaskId
delete msgParams.metamaskId
const approvalCb = this._unconfMsgCbs[msgId] || noop

@ -258,7 +258,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
function estimateGas (cb) {
var estimationParams = extend(txParams)
query.getBlockByNumber('latest', true, function(err, block){
query.getBlockByNumber('latest', true, function (err, block) {
if (err) return cb(err)
// check if gasLimit is already specified
const gasLimitSpecified = Boolean(txParams.gas)
@ -267,7 +267,7 @@ IdentityStore.prototype.addUnconfirmedTransaction = function (txParams, onTxDone
estimationParams.gas = block.gasLimit
}
// run tx, see if it will OOG
query.estimateGas(estimationParams, function(err, estimatedGasHex){
query.estimateGas(estimationParams, function (err, estimatedGasHex) {
if (err) return cb(err.message || err)
// all gas used - must be an error
if (estimatedGasHex === estimationParams.gas) {

@ -177,13 +177,13 @@ function tryUnlockMetamask (password) {
}
}
function transitionForward() {
function transitionForward () {
return {
type: this.TRANSITION_FORWARD,
}
}
function transitionBackward() {
function transitionBackward () {
return {
type: this.TRANSITION_BACKWARD,
}

Loading…
Cancel
Save