|
|
|
const EventEmitter = require('events')
|
|
|
|
const ObservableStore = require('obs-store')
|
|
|
|
const ethUtil = require('ethereumjs-util')
|
Connect distinct accounts per site (#7004)
* add PermissionsController
remove provider approval controller
integrate rpc-cap
create PermissionsController
move provider approval functionality to permissions controller
add permissions approval ui, settings page
add permissions activity and history
move some functionality to metamask-inpage-provider
rename siteMetadata -> domainMetadata
add accountsChange notification to inpage provider
move functionality to inpage provider
update inpage provider
Remove 'Connections' settings page (#7369)
add hooks for exposing accounts in settings
rename unused messages in non-English locales
Add external extension id to metadata (#7396)
update inpage provider, rpc-cap
add eth_requestAccounts handling to background
prevent notifying connections if extension is locked
update inpage provider
Fix lint errors
add migration
review fixes
transaction controller review updates
removed unused messages
* Login Per Site UI (#7368)
* LoginPerSite original UI changes to keep
* First commit
* Get necessary connected tab info for redirect and icon display for permissioned sites
* Fix up designs and add missing features
* Some lint fixes
* More lint fixes
* Ensures the tx controller + tx-state-manager orders transactions in the order they are received
* Code cleanup for LoginPerSite-ui
* Update e2e tests to use new connection flow
* Fix display of connect screen and app header after login when connect request present
* Update metamask-responsive-ui.spec for new item in accounts dropdown
* Fix approve container by replacing approvedOrigins with domainMetaData
* Adds test/e2e/permissions.spec.js
* Correctly handle cancellation of a permissions request
* Redirect to home after disconnecting all sites / cancelling all permissions
* Fix display of site icons in menu
* Fix height of permissions page container
* Remove unused locale messages
* Set default values for openExternalTabs and tabIdOrigins in account-menu.container
* More code cleanup for LoginPerSite-ui
* Use extensions api to close tab in permissions-connect
* Remove unnecessary change in domIsReady() in contentscript
* Remove unnecessary private function markers and class methods (for background tab info) in metamask-controller.
* Adds getOriginOfCurrentTab selector
* Adds IconWithFallback component and substitutes for appropriate cases
* Add and utilize font mixins
* Remove unused method in disconnect-all.container.js
* Simplify buttonSizeLarge code in page-container-footer.component.js
* Add and utilize getAccountsWithLabels selector
* Remove console.log in ui/app/store/actions.js
* Change last connected time format to yyyy-M-d
* Fix css associated with IconWithFallback change
* Ensure tracked openNonMetamaskTabsIDs are correctly set to inactive on tab changes
* Code cleanup for LoginPerSite-ui
* Use reusable function for modifying openNonMetamaskTabsIDs in background.js
* Enables automatic switching to connected account when connected domain is open
* Prevent exploit of tabIdOriginMap in background.js
* Remove unneeded code from contentscript.js
* Simplify current tab origin and window opener logic using remotePort listener tabs.queryTabs
* Design and styling fixes for LoginPerSite-ui
* Fix permissionHistory and permission logging for eth_requestAccounts and eth_accounts
* Front end changes to support display of lastConnected time in connected and permissions screens
* Fix lint errors
* Refactor structure of permissionsHistory
* Fix default values and object modifications for domain and permissionsHistory related data
* Fix connecting to new accounts from modal
* Replace retweet.svg with connect-white.svg
* Fix signature-request.spec
* Update metamask-inpage-provider version
* Fix permissions e2e tests
* Remove unneeded delay from test/e2e/signature-request.spec.js
* Add delay before attempting to retrieve network id in dapp in ethereum-on=.spec
* Use requestAccountTabIds strategy for determining tab id that opened a given window
* Improve default values for permissions requests
* Add some message descriptions to app/_locales/en/messages.json
* Code clean up in permission controller
* Stopped deep cloning object in mapObjectValues
* Bump metamask-inpage-provider version
* Add missing description in app/_locales/en/messages.json
* Return promises from queryTabs and switchToTab of extension.js
* Remove unused getAllPermissions function
* Use default props in icon-with-fallback.component.js
* Stop passing to permissions controller
* Delete no longer used clear-approved-origins modal code
* Remove duplicate imports in ui/app/components/app/index.scss
* Use URL instead of regex in getOriginFromUrl()
* Add runtime error checking to platform, promise based extension.tab methods
* Support permission requests from external extensions
* Improve font size and colour of the domain origin on the permission confirmation screen
* Add support for toggling permissions
* Ensure getRenderablePermissionsDomains only returns domains with exposedAccount caveat permissions
* Remove unused code from LoginPerSite-ui branch
* Ensure modal closes on Enter press for new-account-modal.component.js
* Lint fix
* fixup! Login Per Site UI (#7368)
* Some code cleanup for LoginPerSite
* Adds UX for connecting to dapps via the connected sites screen (#7593)
* Adds UX for connecting to dapps via the connected sites screen
* Use openMetaMaskTabIds from background.js to determine if current active tab is MetaMask
* Delete unused permissions controller methods
* Fixes two small bugs in the LoginPerSite ui (#7595)
* Restore `providerRequest` message translations (#7600)
This message was removed, but it was replaced with a very similar
message called `likeToConnect`. The only difference is that the new
message has "MetaMask" in it. Preserving these messages without
"MetaMask" is probably better than deleting them, so these messages
have all been restored and renamed to `likeToConnect`.
* Login per site no sitemetadata fix (#7610)
* Support connected sites for which we have no site metadata.
* Change property containing subtitle info often populated by origin to a more accurate of purpose name
* Lint fix
* Improve disconnection modal messages (#7612)
* Improve disconnectAccountModalDescription and disconnectAllModalDescription messages
* Update disconnectAccountModalDescription app/_locales/en/messages.json
Co-Authored-By: Mark Stacey <markjstacey@gmail.com>
* Improve disconnectAccount modal message clarity
* Adds cancel button to the account selection screen of the permissions request flow (#7613)
* Fix eth_accounts permission language & selectability (#7614)
* fix eth_accounts language & selectability
* fix MetaMask capitalization in all messages
* Close sidebar when opening connected sites (#7611)
The 'Connected Sites' button in the accounts details now closes the
sidebar, if it is open. This was accomplished by pulling the click
handler for that button up to the wallet view component, where another
button already followed a similar pattern of closing the sidebar.
It seemed confusing to me that one handler was in the `AccountsDetails`
container component, and one was handed down from above, so I added
PropTypes to the container component.
I'm not sure that the WalletView component is the best place for this
logic, but I've put it there for now to be consistent with the add
token button.
* Reject permissions request upon tab close (#7618)
Permissions requests are now rejected when the page is closed. This
only applies to the full-screen view, as that is the view permission
requests should be handled in. The case where the user deals with the
request through a different view is handled in #7617
* Handle tab update failure (#7619)
`extension.tabs.update` can sometimes fail if the user interacts with
the tabs directly around the same time. The redirect flow has been
updated to ensure that the permissions tab is still closed in that
case. The user is on their own to find the dapp tab again in that case.
* Login per site tab popup fixes (#7617)
* Handle redirect in response to state update in permissions-connect
* Ensure origin is available to permissions-connect subcomponents during redirect
* Hide app bar whenever on redirect route
* Improvements to handling of redirects in permissions-connect
* Ensure permission request id change handling only happens when page is not null
* Lint fix
* Decouple confirm transaction screen from the selected address (#7622)
* Avoid race condtion that could prevent contextual account switching (#7623)
There was a race condition in the logic responsible for switching the
selected account based upon the active tab. It was asynchronously
querying the active tab, then assuming it had been retrieved later.
The active tab info itself was already in the redux store in another
spot, one that is guaranteed to be set before the UI renders. The
race condition was avoided by deleting the duplicate state, and using
the other active tab state.
* Only redirect back to dapp if current tab is active (#7621)
The "redirect back to dapp" behaviour can be disruptive when the
permissions connect tab is not active. The purpose of the redirect was
to maintain context between the dapp and the permissions request, but
if the user has already moved to another tab, that no longer applies.
* Fix JSX style lint errors
* Remove unused state
5 years ago
|
|
|
const { ethErrors } = require('eth-json-rpc-errors')
|
|
|
|
const createId = require('./random-id')
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Represents, and contains data about, an 'eth_sign' type signature request. These are created when a signature for
|
|
|
|
* an eth_sign call is requested.
|
|
|
|
*
|
|
|
|
* @see {@link https://github.com/ethereum/wiki/wiki/JSON-RPC#eth_sign}
|
|
|
|
*
|
|
|
|
* @typedef {Object} Message
|
|
|
|
* @property {number} id An id to track and identify the message object
|
|
|
|
* @property {Object} msgParams The parameters to pass to the eth_sign method once the signature request is approved.
|
|
|
|
* @property {Object} msgParams.metamaskId Added to msgParams for tracking and identification within MetaMask.
|
|
|
|
* @property {string} msgParams.data A hex string conversion of the raw buffer data of the signature request
|
|
|
|
* @property {number} time The epoch time at which the this message was created
|
|
|
|
* @property {string} status Indicates whether the signature request is 'unapproved', 'approved', 'signed' or 'rejected'
|
|
|
|
* @property {string} type The json-prc signing method for which a signature request has been made. A 'Message' with
|
|
|
|
* always have a 'eth_sign' type.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
module.exports = class MessageManager extends EventEmitter {
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Controller in charge of managing - storing, adding, removing, updating - Messages.
|
|
|
|
*
|
|
|
|
* @typedef {Object} MessageManager
|
|
|
|
* @param {Object} opts @deprecated
|
|
|
|
* @property {Object} memStore The observable store where Messages are saved.
|
|
|
|
* @property {Object} memStore.unapprovedMsgs A collection of all Messages in the 'unapproved' state
|
|
|
|
* @property {number} memStore.unapprovedMsgCount The count of all Messages in this.memStore.unapprobedMsgs
|
|
|
|
* @property {array} messages Holds all messages that have been created by this MessageManager
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
constructor () {
|
|
|
|
super()
|
|
|
|
this.memStore = new ObservableStore({
|
|
|
|
unapprovedMsgs: {},
|
|
|
|
unapprovedMsgCount: 0,
|
|
|
|
})
|
|
|
|
this.messages = []
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* A getter for the number of 'unapproved' Messages in this.messages
|
|
|
|
*
|
|
|
|
* @returns {number} The number of 'unapproved' Messages in this.messages
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
get unapprovedMsgCount () {
|
|
|
|
return Object.keys(this.getUnapprovedMsgs()).length
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* A getter for the 'unapproved' Messages in this.messages
|
|
|
|
*
|
|
|
|
* @returns {Object} An index of Message ids to Messages, for all 'unapproved' Messages in this.messages
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
getUnapprovedMsgs () {
|
|
|
|
return this.messages.filter(msg => msg.status === 'unapproved')
|
|
|
|
.reduce((result, msg) => {
|
|
|
|
result[msg.id] = msg; return result
|
|
|
|
}, {})
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Creates a new Message with an 'unapproved' status using the passed msgParams. this.addMsg is called to add the
|
|
|
|
* new Message to this.messages, and to save the unapproved Messages from that list to this.memStore.
|
|
|
|
*
|
|
|
|
* @param {Object} msgParams The params for the eth_sign call to be made after the message is approved.
|
|
|
|
* @param {Object} req (optional) The original request object possibly containing the origin
|
|
|
|
* @returns {promise} after signature has been
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
addUnapprovedMessageAsync (msgParams, req) {
|
|
|
|
return new Promise((resolve, reject) => {
|
|
|
|
const msgId = this.addUnapprovedMessage(msgParams, req)
|
|
|
|
// await finished
|
|
|
|
this.once(`${msgId}:finished`, (data) => {
|
|
|
|
switch (data.status) {
|
|
|
|
case 'signed':
|
|
|
|
return resolve(data.rawSig)
|
|
|
|
case 'rejected':
|
Connect distinct accounts per site (#7004)
* add PermissionsController
remove provider approval controller
integrate rpc-cap
create PermissionsController
move provider approval functionality to permissions controller
add permissions approval ui, settings page
add permissions activity and history
move some functionality to metamask-inpage-provider
rename siteMetadata -> domainMetadata
add accountsChange notification to inpage provider
move functionality to inpage provider
update inpage provider
Remove 'Connections' settings page (#7369)
add hooks for exposing accounts in settings
rename unused messages in non-English locales
Add external extension id to metadata (#7396)
update inpage provider, rpc-cap
add eth_requestAccounts handling to background
prevent notifying connections if extension is locked
update inpage provider
Fix lint errors
add migration
review fixes
transaction controller review updates
removed unused messages
* Login Per Site UI (#7368)
* LoginPerSite original UI changes to keep
* First commit
* Get necessary connected tab info for redirect and icon display for permissioned sites
* Fix up designs and add missing features
* Some lint fixes
* More lint fixes
* Ensures the tx controller + tx-state-manager orders transactions in the order they are received
* Code cleanup for LoginPerSite-ui
* Update e2e tests to use new connection flow
* Fix display of connect screen and app header after login when connect request present
* Update metamask-responsive-ui.spec for new item in accounts dropdown
* Fix approve container by replacing approvedOrigins with domainMetaData
* Adds test/e2e/permissions.spec.js
* Correctly handle cancellation of a permissions request
* Redirect to home after disconnecting all sites / cancelling all permissions
* Fix display of site icons in menu
* Fix height of permissions page container
* Remove unused locale messages
* Set default values for openExternalTabs and tabIdOrigins in account-menu.container
* More code cleanup for LoginPerSite-ui
* Use extensions api to close tab in permissions-connect
* Remove unnecessary change in domIsReady() in contentscript
* Remove unnecessary private function markers and class methods (for background tab info) in metamask-controller.
* Adds getOriginOfCurrentTab selector
* Adds IconWithFallback component and substitutes for appropriate cases
* Add and utilize font mixins
* Remove unused method in disconnect-all.container.js
* Simplify buttonSizeLarge code in page-container-footer.component.js
* Add and utilize getAccountsWithLabels selector
* Remove console.log in ui/app/store/actions.js
* Change last connected time format to yyyy-M-d
* Fix css associated with IconWithFallback change
* Ensure tracked openNonMetamaskTabsIDs are correctly set to inactive on tab changes
* Code cleanup for LoginPerSite-ui
* Use reusable function for modifying openNonMetamaskTabsIDs in background.js
* Enables automatic switching to connected account when connected domain is open
* Prevent exploit of tabIdOriginMap in background.js
* Remove unneeded code from contentscript.js
* Simplify current tab origin and window opener logic using remotePort listener tabs.queryTabs
* Design and styling fixes for LoginPerSite-ui
* Fix permissionHistory and permission logging for eth_requestAccounts and eth_accounts
* Front end changes to support display of lastConnected time in connected and permissions screens
* Fix lint errors
* Refactor structure of permissionsHistory
* Fix default values and object modifications for domain and permissionsHistory related data
* Fix connecting to new accounts from modal
* Replace retweet.svg with connect-white.svg
* Fix signature-request.spec
* Update metamask-inpage-provider version
* Fix permissions e2e tests
* Remove unneeded delay from test/e2e/signature-request.spec.js
* Add delay before attempting to retrieve network id in dapp in ethereum-on=.spec
* Use requestAccountTabIds strategy for determining tab id that opened a given window
* Improve default values for permissions requests
* Add some message descriptions to app/_locales/en/messages.json
* Code clean up in permission controller
* Stopped deep cloning object in mapObjectValues
* Bump metamask-inpage-provider version
* Add missing description in app/_locales/en/messages.json
* Return promises from queryTabs and switchToTab of extension.js
* Remove unused getAllPermissions function
* Use default props in icon-with-fallback.component.js
* Stop passing to permissions controller
* Delete no longer used clear-approved-origins modal code
* Remove duplicate imports in ui/app/components/app/index.scss
* Use URL instead of regex in getOriginFromUrl()
* Add runtime error checking to platform, promise based extension.tab methods
* Support permission requests from external extensions
* Improve font size and colour of the domain origin on the permission confirmation screen
* Add support for toggling permissions
* Ensure getRenderablePermissionsDomains only returns domains with exposedAccount caveat permissions
* Remove unused code from LoginPerSite-ui branch
* Ensure modal closes on Enter press for new-account-modal.component.js
* Lint fix
* fixup! Login Per Site UI (#7368)
* Some code cleanup for LoginPerSite
* Adds UX for connecting to dapps via the connected sites screen (#7593)
* Adds UX for connecting to dapps via the connected sites screen
* Use openMetaMaskTabIds from background.js to determine if current active tab is MetaMask
* Delete unused permissions controller methods
* Fixes two small bugs in the LoginPerSite ui (#7595)
* Restore `providerRequest` message translations (#7600)
This message was removed, but it was replaced with a very similar
message called `likeToConnect`. The only difference is that the new
message has "MetaMask" in it. Preserving these messages without
"MetaMask" is probably better than deleting them, so these messages
have all been restored and renamed to `likeToConnect`.
* Login per site no sitemetadata fix (#7610)
* Support connected sites for which we have no site metadata.
* Change property containing subtitle info often populated by origin to a more accurate of purpose name
* Lint fix
* Improve disconnection modal messages (#7612)
* Improve disconnectAccountModalDescription and disconnectAllModalDescription messages
* Update disconnectAccountModalDescription app/_locales/en/messages.json
Co-Authored-By: Mark Stacey <markjstacey@gmail.com>
* Improve disconnectAccount modal message clarity
* Adds cancel button to the account selection screen of the permissions request flow (#7613)
* Fix eth_accounts permission language & selectability (#7614)
* fix eth_accounts language & selectability
* fix MetaMask capitalization in all messages
* Close sidebar when opening connected sites (#7611)
The 'Connected Sites' button in the accounts details now closes the
sidebar, if it is open. This was accomplished by pulling the click
handler for that button up to the wallet view component, where another
button already followed a similar pattern of closing the sidebar.
It seemed confusing to me that one handler was in the `AccountsDetails`
container component, and one was handed down from above, so I added
PropTypes to the container component.
I'm not sure that the WalletView component is the best place for this
logic, but I've put it there for now to be consistent with the add
token button.
* Reject permissions request upon tab close (#7618)
Permissions requests are now rejected when the page is closed. This
only applies to the full-screen view, as that is the view permission
requests should be handled in. The case where the user deals with the
request through a different view is handled in #7617
* Handle tab update failure (#7619)
`extension.tabs.update` can sometimes fail if the user interacts with
the tabs directly around the same time. The redirect flow has been
updated to ensure that the permissions tab is still closed in that
case. The user is on their own to find the dapp tab again in that case.
* Login per site tab popup fixes (#7617)
* Handle redirect in response to state update in permissions-connect
* Ensure origin is available to permissions-connect subcomponents during redirect
* Hide app bar whenever on redirect route
* Improvements to handling of redirects in permissions-connect
* Ensure permission request id change handling only happens when page is not null
* Lint fix
* Decouple confirm transaction screen from the selected address (#7622)
* Avoid race condtion that could prevent contextual account switching (#7623)
There was a race condition in the logic responsible for switching the
selected account based upon the active tab. It was asynchronously
querying the active tab, then assuming it had been retrieved later.
The active tab info itself was already in the redux store in another
spot, one that is guaranteed to be set before the UI renders. The
race condition was avoided by deleting the duplicate state, and using
the other active tab state.
* Only redirect back to dapp if current tab is active (#7621)
The "redirect back to dapp" behaviour can be disruptive when the
permissions connect tab is not active. The purpose of the redirect was
to maintain context between the dapp and the permissions request, but
if the user has already moved to another tab, that no longer applies.
* Fix JSX style lint errors
* Remove unused state
5 years ago
|
|
|
return reject(ethErrors.provider.userRejectedRequest('MetaMask Message Signature: User denied message signature.'))
|
|
|
|
default:
|
|
|
|
return reject(new Error(`MetaMask Message Signature: Unknown problem: ${JSON.stringify(msgParams)}`))
|
|
|
|
}
|
|
|
|
})
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Creates a new Message with an 'unapproved' status using the passed msgParams. this.addMsg is called to add the
|
|
|
|
* new Message to this.messages, and to save the unapproved Messages from that list to this.memStore.
|
|
|
|
*
|
|
|
|
* @param {Object} msgParams The params for the eth_sign call to be made after the message is approved.
|
|
|
|
* @param {Object} req (optional) The original request object where the origin may be specificied
|
|
|
|
* @returns {number} The id of the newly created message.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
addUnapprovedMessage (msgParams, req) {
|
|
|
|
// add origin from request
|
|
|
|
if (req) {
|
|
|
|
msgParams.origin = req.origin
|
|
|
|
}
|
|
|
|
msgParams.data = normalizeMsgData(msgParams.data)
|
|
|
|
// create txData obj with parameters and meta data
|
|
|
|
const time = (new Date()).getTime()
|
|
|
|
const msgId = createId()
|
|
|
|
const msgData = {
|
|
|
|
id: msgId,
|
|
|
|
msgParams: msgParams,
|
|
|
|
time: time,
|
|
|
|
status: 'unapproved',
|
|
|
|
type: 'eth_sign',
|
|
|
|
}
|
|
|
|
this.addMsg(msgData)
|
|
|
|
|
|
|
|
// signal update
|
|
|
|
this.emit('update')
|
|
|
|
return msgId
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Adds a passed Message to this.messages, and calls this._saveMsgList() to save the unapproved Messages from that
|
|
|
|
* list to this.memStore.
|
|
|
|
*
|
|
|
|
* @param {Message} msg The Message to add to this.messages
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
addMsg (msg) {
|
|
|
|
this.messages.push(msg)
|
|
|
|
this._saveMsgList()
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a specified Message.
|
|
|
|
*
|
|
|
|
* @param {number} msgId The id of the Message to get
|
|
|
|
* @returns {Message|undefined} The Message with the id that matches the passed msgId, or undefined if no Message has that id.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
getMsg (msgId) {
|
|
|
|
return this.messages.find(msg => msg.id === msgId)
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Approves a Message. Sets the message status via a call to this.setMsgStatusApproved, and returns a promise with
|
|
|
|
* any the message params modified for proper signing.
|
|
|
|
*
|
|
|
|
* @param {Object} msgParams The msgParams to be used when eth_sign is called, plus data added by MetaMask.
|
|
|
|
* @param {Object} msgParams.metamaskId Added to msgParams for tracking and identification within MetaMask.
|
|
|
|
* @returns {Promise<object>} Promises the msgParams object with metamaskId removed.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
approveMessage (msgParams) {
|
|
|
|
this.setMsgStatusApproved(msgParams.metamaskId)
|
|
|
|
return this.prepMsgForSigning(msgParams)
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Sets a Message status to 'approved' via a call to this._setMsgStatus.
|
|
|
|
*
|
|
|
|
* @param {number} msgId The id of the Message to approve.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
setMsgStatusApproved (msgId) {
|
|
|
|
this._setMsgStatus(msgId, 'approved')
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Sets a Message status to 'signed' via a call to this._setMsgStatus and updates that Message in this.messages by
|
|
|
|
* adding the raw signature data of the signature request to the Message
|
|
|
|
*
|
|
|
|
* @param {number} msgId The id of the Message to sign.
|
|
|
|
* @param {buffer} rawSig The raw data of the signature request
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
setMsgStatusSigned (msgId, rawSig) {
|
|
|
|
const msg = this.getMsg(msgId)
|
|
|
|
msg.rawSig = rawSig
|
|
|
|
this._updateMsg(msg)
|
|
|
|
this._setMsgStatus(msgId, 'signed')
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Removes the metamaskId property from passed msgParams and returns a promise which resolves the updated msgParams
|
|
|
|
*
|
|
|
|
* @param {Object} msgParams The msgParams to modify
|
|
|
|
* @returns {Promise<object>} Promises the msgParams with the metamaskId property removed
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
prepMsgForSigning (msgParams) {
|
|
|
|
delete msgParams.metamaskId
|
|
|
|
return Promise.resolve(msgParams)
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Sets a Message status to 'rejected' via a call to this._setMsgStatus.
|
|
|
|
*
|
|
|
|
* @param {number} msgId The id of the Message to reject.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
rejectMsg (msgId) {
|
|
|
|
this._setMsgStatus(msgId, 'rejected')
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Updates the status of a Message in this.messages via a call to this._updateMsg
|
|
|
|
*
|
|
|
|
* @private
|
|
|
|
* @param {number} msgId The id of the Message to update.
|
|
|
|
* @param {string} status The new status of the Message.
|
|
|
|
* @throws A 'MessageManager - Message not found for id: "${msgId}".' if there is no Message in this.messages with an
|
|
|
|
* id equal to the passed msgId
|
|
|
|
* @fires An event with a name equal to `${msgId}:${status}`. The Message is also fired.
|
|
|
|
* @fires If status is 'rejected' or 'signed', an event with a name equal to `${msgId}:finished` is fired along with the message
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
_setMsgStatus (msgId, status) {
|
|
|
|
const msg = this.getMsg(msgId)
|
|
|
|
if (!msg) {
|
|
|
|
throw new Error('MessageManager - Message not found for id: "${msgId}".')
|
|
|
|
}
|
|
|
|
msg.status = status
|
|
|
|
this._updateMsg(msg)
|
|
|
|
this.emit(`${msgId}:${status}`, msg)
|
|
|
|
if (status === 'rejected' || status === 'signed') {
|
|
|
|
this.emit(`${msgId}:finished`, msg)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Sets a Message in this.messages to the passed Message if the ids are equal. Then saves the unapprovedMsg list to
|
|
|
|
* storage via this._saveMsgList
|
|
|
|
*
|
|
|
|
* @private
|
|
|
|
* @param {msg} Message A Message that will replace an existing Message (with the same id) in this.messages
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
_updateMsg (msg) {
|
|
|
|
const index = this.messages.findIndex((message) => message.id === msg.id)
|
|
|
|
if (index !== -1) {
|
|
|
|
this.messages[index] = msg
|
|
|
|
}
|
|
|
|
this._saveMsgList()
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Saves the unapproved messages, and their count, to this.memStore
|
|
|
|
*
|
|
|
|
* @private
|
|
|
|
* @fires 'updateBadge'
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
_saveMsgList () {
|
|
|
|
const unapprovedMsgs = this.getUnapprovedMsgs()
|
|
|
|
const unapprovedMsgCount = Object.keys(unapprovedMsgs).length
|
|
|
|
this.memStore.updateState({ unapprovedMsgs, unapprovedMsgCount })
|
|
|
|
this.emit('updateBadge')
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* A helper function that converts raw buffer data to a hex, or just returns the data if it is already formatted as a hex.
|
|
|
|
*
|
|
|
|
* @param {any} data The buffer data to convert to a hex
|
|
|
|
* @returns {string} A hex string conversion of the buffer data
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
function normalizeMsgData (data) {
|
|
|
|
if (data.slice(0, 2) === '0x') {
|
|
|
|
// data is already hex
|
|
|
|
return data
|
|
|
|
} else {
|
|
|
|
// data is unicode, convert to hex
|
|
|
|
return ethUtil.bufferToHex(Buffer.from(data, 'utf8'))
|
|
|
|
}
|
|
|
|
}
|