m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-26 20:39:08 +01:00
Code

Ensure 3box validation uses the correct address (#7235)

Browse Source
This commit is contained in:
Dan J Miller 2019-10-01 10:33:13 -02:30 committed by Mark Stacey
parent 8d97bdc5c9
commit daf4fe439c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/scripts/controllers/threebox.js
View File

@ -20,7 +20,6 @@ class ThreeBoxController {
addressBookController, addressBookController,
version, version,
getKeyringControllerState, getKeyringControllerState,
getSelectedAddress,
} = opts } = opts
this.preferencesController = preferencesController this.preferencesController = preferencesController
@ -32,18 +31,20 @@ class ThreeBoxController {
if (origin !== '3Box') { return [] } if (origin !== '3Box') { return [] }
const isUnlocked = getKeyringControllerState().isUnlocked const isUnlocked = getKeyringControllerState().isUnlocked
const selectedAddress = getSelectedAddress() const accounts = await this.keyringController.getAccounts()
if (isUnlocked && selectedAddress) { if (isUnlocked && accounts[0]) {
return [selectedAddress] const appKeyAddress = await this.keyringController.getAppKeyAddress(accounts[0], 'wallet://3box.metamask.io')
return [appKeyAddress]
} else { } else {
return [] return []
} }
}, },
processPersonalMessage: (msgParams) => { processPersonalMessage: async (msgParams) => {
return Promise.resolve(keyringController.signPersonalMessage(msgParams, { const accounts = await this.keyringController.getAccounts()
return keyringController.signPersonalMessage({ ...msgParams, from: accounts[0] }, {
withAppKeyOrigin: 'wallet://3box.metamask.io', withAppKeyOrigin: 'wallet://3box.metamask.io',
})) })
}, },
}) })

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

@ -206,7 +206,6 @@ module.exports = class MetamaskController extends EventEmitter {
keyringController: this.keyringController, keyringController: this.keyringController,
initState: initState.ThreeBoxController, initState: initState.ThreeBoxController,
getKeyringControllerState: this.keyringController.memStore.getState.bind(this.keyringController.memStore), getKeyringControllerState: this.keyringController.memStore.getState.bind(this.keyringController.memStore),
getSelectedAddress: this.preferencesController.getSelectedAddress.bind(this.preferencesController),
version, version,
}) })