aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/scripts/keyring-controller.js11
-rw-r--r--app/scripts/metamask-controller.js1
2 files changed, 6 insertions, 6 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 8c379b5b9..f2891db37 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -5,7 +5,8 @@ const EventEmitter = require('events').EventEmitter
const ObservableStore = require('obs-store')
const filter = require('promise-filter')
const encryptor = require('browser-passworder')
-const normalizeAddress = require('eth-sig-util').normalize
+const sigUtil = require('eth-sig-util')
+const normalizeAddress = sigUtil.normalize
// Keyrings:
const SimpleKeyring = require('eth-simple-keyring')
const HdKeyring = require('eth-hd-keyring')
@@ -284,11 +285,8 @@ class KeyringController extends EventEmitter {
//
// recovers a signature of the prefixed-style personalMessage signature.
recoverPersonalMessage (msgParams) {
- const address = normalizeAddress(msgParams.from)
- return this.getKeyringForAccount(address)
- .then((keyring) => {
- return keyring.recoverPersonalMessage(address, msgParams.data)
- })
+ const address = sigUtil.recoverPersonalSignature(msgParams)
+ return Promise.resolve(address)
}
// PRIVATE METHODS
@@ -500,6 +498,7 @@ class KeyringController extends EventEmitter {
// the specified `address` if one exists.
getKeyringForAccount (address) {
const hexed = normalizeAddress(address)
+ log.debug(`KeyringController - getKeyringForAccount: ${hexed}`)
return Promise.all(this.keyrings.map((keyring) => {
return Promise.all([
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index eace72c24..995db1c0a 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -534,6 +534,7 @@ module.exports = class MetamaskController extends EventEmitter {
}
recoverPersonalMessage (msgParams) {
+ log.debug(`MetaMaskController - recoverPersonalMessage: ${JSON.stringify(msgParams)}`)
const keyringController = this.keyringController
return keyringController.recoverPersonalMessage(msgParams)
}