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

Point metamask-controller personalSignRecover method to keyring-controller

Browse Source
This commit is contained in:
Dan Finlay 2017-02-21 14:30:07 -08:00
parent 0584988688
commit 92fb07999a
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,6 @@ const autoFaucet = require('./lib/auto-faucet')
const nodeify = require('./lib/nodeify') const nodeify = require('./lib/nodeify')
const IdStoreMigrator = require('./lib/idStore-migrator') const IdStoreMigrator = require('./lib/idStore-migrator')
const accountImporter = require('./account-import-strategies') const accountImporter = require('./account-import-strategies')
const sigUtil = require('eth-sig-util')
const version = require('../manifest.json').version const version = require('../manifest.json').version
@ -152,6 +151,8 @@ module.exports = class MetamaskController extends EventEmitter {
// //
initializeProvider () { initializeProvider () {
const keyringController = this.keyringController
let provider = MetaMaskProvider({ let provider = MetaMaskProvider({
static: { static: {
eth_syncing: false, eth_syncing: false,
@ -171,8 +172,8 @@ module.exports = class MetamaskController extends EventEmitter {
// new style msg signing // new style msg signing
approvePersonalMessage: this.approvePersonalMessage.bind(this), approvePersonalMessage: this.approvePersonalMessage.bind(this),
signPersonalMessage: this.signPersonalMessage.bind(this), signPersonalMessage: nodeify(this.signPersonalMessage).bind(this),
personalRecoverSigner: this.personalRecoverSigner.bind(this), personalRecoverSigner: nodeify(keyringController.recoverPersonalMessage).bind(keyringController),
}) })
return provider return provider
} }
@ -459,7 +460,7 @@ module.exports = class MetamaskController extends EventEmitter {
} }
// Prefixed Style Message Signing Methods: // Prefixed Style Message Signing Methods:
approvePersonalMessage (cb) { approvePersonalMessage (msgParams, cb) {
let msgId = this.personalMessageManager.addUnapprovedMessage(msgParams) let msgId = this.personalMessageManager.addUnapprovedMessage(msgParams)
this.sendUpdate() this.sendUpdate()
this.opts.showUnconfirmedMessage() this.opts.showUnconfirmedMessage()
@ -492,11 +493,6 @@ module.exports = class MetamaskController extends EventEmitter {
}) })
} }
personalRecoverSigner (msgParams) {
const recovered = sigUtil.recoverPersonalSignature(msgParams)
return Promise.resolve(recovered)
}
markAccountsFound (cb) { markAccountsFound (cb) {
this.configManager.setLostAccounts([]) this.configManager.setLostAccounts([])
this.sendUpdate() this.sendUpdate()