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

Mostly fix personal_recover

Browse Source
This commit is contained in:
Dan Finlay 2017-02-24 16:36:29 -08:00
parent a35229e8d4
commit f2851402f3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/scripts/keyring-controller.js
View File

@ -5,7 +5,8 @@ const EventEmitter = require('events').EventEmitter
const ObservableStore = require('obs-store') const ObservableStore = require('obs-store')
const filter = require('promise-filter') const filter = require('promise-filter')
const encryptor = require('browser-passworder') const encryptor = require('browser-passworder')
const normalizeAddress = require('eth-sig-util').normalize const sigUtil = require('eth-sig-util')
const normalizeAddress = sigUtil.normalize
// Keyrings: // Keyrings:
const SimpleKeyring = require('eth-simple-keyring') const SimpleKeyring = require('eth-simple-keyring')
const HdKeyring = require('eth-hd-keyring') const HdKeyring = require('eth-hd-keyring')
@ -284,11 +285,8 @@ class KeyringController extends EventEmitter {
// //
// recovers a signature of the prefixed-style personalMessage signature. // recovers a signature of the prefixed-style personalMessage signature.
recoverPersonalMessage (msgParams) { recoverPersonalMessage (msgParams) {
const address = normalizeAddress(msgParams.from) const address = sigUtil.recoverPersonalSignature(msgParams)
return this.getKeyringForAccount(address) return Promise.resolve(address)
.then((keyring) => {
return keyring.recoverPersonalMessage(address, msgParams.data)
})
} }
// PRIVATE METHODS // PRIVATE METHODS
@ -500,6 +498,7 @@ class KeyringController extends EventEmitter {
// the specified `address` if one exists. // the specified `address` if one exists.
getKeyringForAccount (address) { getKeyringForAccount (address) {
const hexed = normalizeAddress(address) const hexed = normalizeAddress(address)
log.debug(`KeyringController - getKeyringForAccount: ${hexed}`)
return Promise.all(this.keyrings.map((keyring) => { return Promise.all(this.keyrings.map((keyring) => {
return Promise.all([ return Promise.all([

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

@ -534,6 +534,7 @@ module.exports = class MetamaskController extends EventEmitter {
} }
recoverPersonalMessage (msgParams) { recoverPersonalMessage (msgParams) {
log.debug(`MetaMaskController - recoverPersonalMessage: ${JSON.stringify(msgParams)}`)
const keyringController = this.keyringController const keyringController = this.keyringController
return keyringController.recoverPersonalMessage(msgParams) return keyringController.recoverPersonalMessage(msgParams)
} }