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

signTx+Msg - show Account Unlock Request when locked

Browse Source
This commit is contained in:
kumavis 2016-05-24 14:59:33 -07:00
parent 9aea88da32
commit 1d23bf8122
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/scripts/background.js
View File

@ -8,6 +8,7 @@ const handleRequestsFromStream = require('web3-stream-provider/handler')
const ObjectMultiplex = require('./lib/obj-multiplex') const ObjectMultiplex = require('./lib/obj-multiplex')
const PortStream = require('./lib/port-stream.js') const PortStream = require('./lib/port-stream.js')
const IdentityStore = require('./lib/idStore') const IdentityStore = require('./lib/idStore')
const createUnlockRequestNotification = require('./lib/notifications.js').createUnlockRequestNotification
const createTxNotification = require('./lib/notifications.js').createTxNotification const createTxNotification = require('./lib/notifications.js').createTxNotification
const createMsgNotification = require('./lib/notifications.js').createMsgNotification const createMsgNotification = require('./lib/notifications.js').createMsgNotification
const configManager = require('./lib/config-manager-singleton') const configManager = require('./lib/config-manager-singleton')
@ -65,10 +66,10 @@ var providerOpts = {
cb(null, result) cb(null, result)
}, },
// tx signing // tx signing
approveTransaction: addUnconfirmedTx, approveTransaction: approveTransaction,
signTransaction: idStore.signTransaction.bind(idStore), signTransaction: idStore.signTransaction.bind(idStore),
// msg signing // msg signing
approveMessage: addUnconfirmedMsg, approveMessage: approveMessage,
signMessage: idStore.signMessage.bind(idStore), signMessage: idStore.signMessage.bind(idStore),
} }
var provider = MetaMaskProvider(providerOpts) var provider = MetaMaskProvider(providerOpts)
@ -217,6 +218,30 @@ function updateBadge(state){
// Add unconfirmed Tx + Msg // Add unconfirmed Tx + Msg
// //
function approveTransaction(txParams, cb){
var state = idStore.getState()
if (!state.isUnlocked) {
createUnlockRequestNotification({
title: 'Account Unlock Request',
})
var txId = idStore.addUnconfirmedTransaction(txParams, cb)
} else {
addUnconfirmedTx(txParams, cb)
}
}
function approveMessage(msgParams, cb){
var state = idStore.getState()
if (!state.isUnlocked) {
createUnlockRequestNotification({
title: 'Account Unlock Request',
})
var msgId = idStore.addUnconfirmedMessage(msgParams, cb)
} else {
addUnconfirmedMsg(msgParams, cb)
}
}
function addUnconfirmedTx(txParams, cb){ function addUnconfirmedTx(txParams, cb){
var txId = idStore.addUnconfirmedTransaction(txParams, cb) var txId = idStore.addUnconfirmedTransaction(txParams, cb)
createTxNotification({ createTxNotification({

14
app/scripts/lib/notifications.js
View File

@ -3,6 +3,7 @@ const uiUtils = require('../../../ui/app/util')
var notificationHandlers = {} var notificationHandlers = {}
module.exports = { module.exports = {
createUnlockRequestNotification: createUnlockRequestNotification,
createTxNotification: createTxNotification, createTxNotification: createTxNotification,
createMsgNotification: createMsgNotification, createMsgNotification: createMsgNotification,
} }
@ -24,6 +25,19 @@ chrome.notifications.onClosed.addListener(function(notificationId){
}) })
// creation helper // creation helper
function createUnlockRequestNotification(opts){
var message = 'An Ethereum app has requested a signature. Please unlock your account.'
var id = createId()
chrome.notifications.create(id, {
type: 'basic',
iconUrl: '/images/icon-128.png',
title: opts.title,
message: message,
})
}
function createTxNotification(opts){ function createTxNotification(opts){
var message = [ var message = [
'to: '+uiUtils.addressSummary(opts.txParams.to), 'to: '+uiUtils.addressSummary(opts.txParams.to),