|
|
@ -5,7 +5,36 @@ const assert = require('assert') |
|
|
|
const sigUtil = require('eth-sig-util') |
|
|
|
const sigUtil = require('eth-sig-util') |
|
|
|
const log = require('loglevel') |
|
|
|
const log = require('loglevel') |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* Represents, and contains data about, an 'eth_signTypedData' type signature request. These are created when a |
|
|
|
|
|
|
|
* signature for an eth_signTypedData call is requested. |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @typedef {Object} TypedMessage |
|
|
|
|
|
|
|
* @property {number} id An id to track and identify the message object |
|
|
|
|
|
|
|
* @property {Object} msgParams The parameters to pass to the eth_signTypedData method once the signature request is |
|
|
|
|
|
|
|
* approved. |
|
|
|
|
|
|
|
* @property {Object} msgParams.metamaskId Added to msgParams for tracking and identification within MetaMask. |
|
|
|
|
|
|
|
* @property {Object} msgParams.from The address that is making the signature request. |
|
|
|
|
|
|
|
* @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' will |
|
|
|
|
|
|
|
* always have a 'eth_signTypedData' type. |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
|
|
|
|
module.exports = class TypedMessageManager extends EventEmitter { |
|
|
|
module.exports = class TypedMessageManager extends EventEmitter { |
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* Controller in charge of managing - storing, adding, removing, updating - TypedMessage. |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @typedef {Object} TypedMessage |
|
|
|
|
|
|
|
* @param {Object} opts @deprecated |
|
|
|
|
|
|
|
* @property {Object} memStore The observable store where TypedMessage are saved. |
|
|
|
|
|
|
|
* @property {Object} memStore.unapprovedTypedMessages A collection of all TypedMessages in the 'unapproved' state |
|
|
|
|
|
|
|
* @property {number} memStore.unapprovedTypedMessagesCount The count of all TypedMessages in this.memStore.unapprobedMsgs |
|
|
|
|
|
|
|
* @property {array} messages Holds all messages that have been created by this TypedMessage |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
*/ |
|
|
|
constructor (opts) { |
|
|
|
constructor (opts) { |
|
|
|
super() |
|
|
|
super() |
|
|
|
this.memStore = new ObservableStore({ |
|
|
|
this.memStore = new ObservableStore({ |
|
|
@ -15,15 +44,37 @@ module.exports = class TypedMessageManager extends EventEmitter { |
|
|
|
this.messages = [] |
|
|
|
this.messages = [] |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* A getter for the number of 'unapproved' TypedMessages in this.messages |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @returns {number} The number of 'unapproved' TypedMessages in this.messages |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
*/ |
|
|
|
get unapprovedTypedMessagesCount () { |
|
|
|
get unapprovedTypedMessagesCount () { |
|
|
|
return Object.keys(this.getUnapprovedMsgs()).length |
|
|
|
return Object.keys(this.getUnapprovedMsgs()).length |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* A getter for the 'unapproved' TypedMessages in this.messages |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @returns {Object} An index of TypedMessage ids to TypedMessages, for all 'unapproved' TypedMessages in |
|
|
|
|
|
|
|
* this.messages |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
*/ |
|
|
|
getUnapprovedMsgs () { |
|
|
|
getUnapprovedMsgs () { |
|
|
|
return this.messages.filter(msg => msg.status === 'unapproved') |
|
|
|
return this.messages.filter(msg => msg.status === 'unapproved') |
|
|
|
.reduce((result, msg) => { result[msg.id] = msg; return result }, {}) |
|
|
|
.reduce((result, msg) => { result[msg.id] = msg; return result }, {}) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* Creates a new TypedMessage with an 'unapproved' status using the passed msgParams. this.addMsg is called to add |
|
|
|
|
|
|
|
* the new TypedMessage to this.messages, and to save the unapproved TypedMessages from that list to |
|
|
|
|
|
|
|
* this.memStore. Before any of this is done, msgParams are validated |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @param {Object} msgParams The params for the eth_sign call to be made after the message is approved. |
|
|
|
|
|
|
|
* @returns {number} The id of the newly created TypedMessage. |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
*/ |
|
|
|
addUnapprovedMessage (msgParams) { |
|
|
|
addUnapprovedMessage (msgParams) { |
|
|
|
this.validateParams(msgParams) |
|
|
|
this.validateParams(msgParams) |
|
|
|
|
|
|
|
|
|
|
@ -45,6 +96,12 @@ module.exports = class TypedMessageManager extends EventEmitter { |
|
|
|
return msgId |
|
|
|
return msgId |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* Helper method for this.addUnapprovedMessage. Validates that the passed params have the required properties. |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @param {Object} params The params to validate |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
*/ |
|
|
|
validateParams (params) { |
|
|
|
validateParams (params) { |
|
|
|
assert.equal(typeof params, 'object', 'Params should ben an object.') |
|
|
|
assert.equal(typeof params, 'object', 'Params should ben an object.') |
|
|
|
assert.ok('data' in params, 'Params must include a data field.') |
|
|
|
assert.ok('data' in params, 'Params must include a data field.') |
|
|
@ -56,24 +113,62 @@ module.exports = class TypedMessageManager extends EventEmitter { |
|
|
|
}, 'Expected EIP712 typed data') |
|
|
|
}, 'Expected EIP712 typed data') |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* Adds a passed TypedMessage to this.messages, and calls this._saveMsgList() to save the unapproved TypedMessages from that |
|
|
|
|
|
|
|
* list to this.memStore. |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @param {Message} msg The TypedMessage to add to this.messages |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
*/ |
|
|
|
addMsg (msg) { |
|
|
|
addMsg (msg) { |
|
|
|
this.messages.push(msg) |
|
|
|
this.messages.push(msg) |
|
|
|
this._saveMsgList() |
|
|
|
this._saveMsgList() |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* Returns a specified TypedMessage. |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @param {number} msgId The id of the TypedMessage to get |
|
|
|
|
|
|
|
* @returns {TypedMessage|undefined} The TypedMessage with the id that matches the passed msgId, or undefined |
|
|
|
|
|
|
|
* if no TypedMessage has that id. |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
*/ |
|
|
|
getMsg (msgId) { |
|
|
|
getMsg (msgId) { |
|
|
|
return this.messages.find(msg => msg.id === msgId) |
|
|
|
return this.messages.find(msg => msg.id === msgId) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* Approves a TypedMessage. 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) { |
|
|
|
approveMessage (msgParams) { |
|
|
|
this.setMsgStatusApproved(msgParams.metamaskId) |
|
|
|
this.setMsgStatusApproved(msgParams.metamaskId) |
|
|
|
return this.prepMsgForSigning(msgParams) |
|
|
|
return this.prepMsgForSigning(msgParams) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* Sets a TypedMessage status to 'approved' via a call to this._setMsgStatus. |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @param {number} msgId The id of the TypedMessage to approve. |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
*/ |
|
|
|
setMsgStatusApproved (msgId) { |
|
|
|
setMsgStatusApproved (msgId) { |
|
|
|
this._setMsgStatus(msgId, 'approved') |
|
|
|
this._setMsgStatus(msgId, 'approved') |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* Sets a TypedMessage status to 'signed' via a call to this._setMsgStatus and updates that TypedMessage in |
|
|
|
|
|
|
|
* this.messages by adding the raw signature data of the signature request to the TypedMessage |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @param {number} msgId The id of the TypedMessage to sign. |
|
|
|
|
|
|
|
* @param {buffer} rawSig The raw data of the signature request |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
*/ |
|
|
|
setMsgStatusSigned (msgId, rawSig) { |
|
|
|
setMsgStatusSigned (msgId, rawSig) { |
|
|
|
const msg = this.getMsg(msgId) |
|
|
|
const msg = this.getMsg(msgId) |
|
|
|
msg.rawSig = rawSig |
|
|
|
msg.rawSig = rawSig |
|
|
@ -81,11 +176,24 @@ module.exports = class TypedMessageManager extends EventEmitter { |
|
|
|
this._setMsgStatus(msgId, 'signed') |
|
|
|
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) { |
|
|
|
prepMsgForSigning (msgParams) { |
|
|
|
delete msgParams.metamaskId |
|
|
|
delete msgParams.metamaskId |
|
|
|
return Promise.resolve(msgParams) |
|
|
|
return Promise.resolve(msgParams) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* Sets a TypedMessage status to 'rejected' via a call to this._setMsgStatus. |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @param {number} msgId The id of the TypedMessage to reject. |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
*/ |
|
|
|
rejectMsg (msgId) { |
|
|
|
rejectMsg (msgId) { |
|
|
|
this._setMsgStatus(msgId, 'rejected') |
|
|
|
this._setMsgStatus(msgId, 'rejected') |
|
|
|
} |
|
|
|
} |
|
|
@ -94,6 +202,19 @@ module.exports = class TypedMessageManager extends EventEmitter { |
|
|
|
// PRIVATE METHODS
|
|
|
|
// PRIVATE METHODS
|
|
|
|
//
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* Updates the status of a TypedMessage in this.messages via a call to this._updateMsg |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @private |
|
|
|
|
|
|
|
* @param {number} msgId The id of the TypedMessage to update. |
|
|
|
|
|
|
|
* @param {string} status The new status of the TypedMessage. |
|
|
|
|
|
|
|
* @throws A 'TypedMessageManager - TypedMessage not found for id: "${msgId}".' if there is no TypedMessage |
|
|
|
|
|
|
|
* in this.messages with an id equal to the passed msgId |
|
|
|
|
|
|
|
* @fires An event with a name equal to `${msgId}:${status}`. The TypedMessage is also fired. |
|
|
|
|
|
|
|
* @fires If status is 'rejected' or 'signed', an event with a name equal to `${msgId}:finished` is fired along |
|
|
|
|
|
|
|
* with the TypedMessage |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
*/ |
|
|
|
_setMsgStatus (msgId, status) { |
|
|
|
_setMsgStatus (msgId, status) { |
|
|
|
const msg = this.getMsg(msgId) |
|
|
|
const msg = this.getMsg(msgId) |
|
|
|
if (!msg) throw new Error('TypedMessageManager - Message not found for id: "${msgId}".') |
|
|
|
if (!msg) throw new Error('TypedMessageManager - Message not found for id: "${msgId}".') |
|
|
@ -105,6 +226,15 @@ module.exports = class TypedMessageManager extends EventEmitter { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* Sets a TypedMessage in this.messages to the passed TypedMessage if the ids are equal. Then saves the |
|
|
|
|
|
|
|
* unapprovedTypedMsgs index to storage via this._saveMsgList |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @private |
|
|
|
|
|
|
|
* @param {msg} TypedMessage A TypedMessage that will replace an existing TypedMessage (with the same |
|
|
|
|
|
|
|
* id) in this.messages |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
*/ |
|
|
|
_updateMsg (msg) { |
|
|
|
_updateMsg (msg) { |
|
|
|
const index = this.messages.findIndex((message) => message.id === msg.id) |
|
|
|
const index = this.messages.findIndex((message) => message.id === msg.id) |
|
|
|
if (index !== -1) { |
|
|
|
if (index !== -1) { |
|
|
@ -113,6 +243,13 @@ module.exports = class TypedMessageManager extends EventEmitter { |
|
|
|
this._saveMsgList() |
|
|
|
this._saveMsgList() |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
|
|
* Saves the unapproved TypedMessages, and their count, to this.memStore |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
* @private |
|
|
|
|
|
|
|
* @fires 'updateBadge' |
|
|
|
|
|
|
|
* |
|
|
|
|
|
|
|
*/ |
|
|
|
_saveMsgList () { |
|
|
|
_saveMsgList () { |
|
|
|
const unapprovedTypedMessages = this.getUnapprovedMsgs() |
|
|
|
const unapprovedTypedMessages = this.getUnapprovedMsgs() |
|
|
|
const unapprovedTypedMessagesCount = Object.keys(unapprovedTypedMessages).length |
|
|
|
const unapprovedTypedMessagesCount = Object.keys(unapprovedTypedMessages).length |
|
|
|