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

Update new method namespace from v2 to v3

Browse Source
This commit is contained in:
bitpshr 2018-09-13 15:12:08 -04:00
parent 68c2554296
commit 42fdcf6239
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scripts/lib/typed-message-manager.js
View File

@ -140,7 +140,7 @@ module.exports = class TypedMessageManager extends EventEmitter {
sigUtil.typedSignatureHash(params.data) sigUtil.typedSignatureHash(params.data)
}, 'Expected EIP712 typed data') }, 'Expected EIP712 typed data')
break break
case 'V2': case 'V3':
let data let data
assert.equal(typeof params, 'object', 'Params should be an object.') assert.equal(typeof params, 'object', 'Params should be an object.')
assert.ok('data' in params, 'Params must include a data field.') assert.ok('data' in params, 'Params must include a data field.')

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

@ -991,7 +991,7 @@ module.exports = class MetamaskController extends EventEmitter {
case 'V1': case 'V1':
signature = sigUtil.signTypedDataLegacy(privKey, { data: cleanMsgParams.data }) signature = sigUtil.signTypedDataLegacy(privKey, { data: cleanMsgParams.data })
break break
case 'V2': case 'V3':
signature = sigUtil.signTypedData(privKey, { data: JSON.parse(cleanMsgParams.data) }) signature = sigUtil.signTypedData(privKey, { data: JSON.parse(cleanMsgParams.data) })
break break
} }
@ -1253,7 +1253,7 @@ module.exports = class MetamaskController extends EventEmitter {
engine.push(this.preferencesController.requestWatchAsset.bind(this.preferencesController)) engine.push(this.preferencesController.requestWatchAsset.bind(this.preferencesController))
engine.push(this.createTypedDataMiddleware('eth_signTypedData', 'V1').bind(this)) engine.push(this.createTypedDataMiddleware('eth_signTypedData', 'V1').bind(this))
engine.push(this.createTypedDataMiddleware('eth_signTypedData_v1', 'V1').bind(this)) engine.push(this.createTypedDataMiddleware('eth_signTypedData_v1', 'V1').bind(this))
engine.push(this.createTypedDataMiddleware('eth_signTypedData_v2', 'V2').bind(this)) engine.push(this.createTypedDataMiddleware('eth_signTypedData_v3', 'V3').bind(this))
engine.push(createProviderMiddleware({ provider: this.provider })) engine.push(createProviderMiddleware({ provider: this.provider }))
// setup connection // setup connection

6
old-ui/app/components/typed-message-renderer.js
View File

@ -19,8 +19,8 @@ TypedMessageRenderer.prototype.render = function () {
case 'V1': case 'V1':
text = renderTypedData(value) text = renderTypedData(value)
break break
case 'V2': case 'V3':
text = renderTypedDataV2(value) text = renderTypedDataV3(value)
break break
} }
@ -54,7 +54,7 @@ function renderTypedData (values) {
}) })
} }
function renderTypedDataV2 (values) { function renderTypedDataV3 (values) {
const { domain, message } = JSON.parse(values) const { domain, message } = JSON.parse(values)
return [ return [
domain ? h('div', [ domain ? h('div', [

6
ui/app/components/signature-request.js
View File

@ -171,7 +171,7 @@ SignatureRequest.prototype.msgHexToText = function (hex) {
} }
// eslint-disable-next-line react/display-name // eslint-disable-next-line react/display-name
SignatureRequest.prototype.renderTypedDataV2 = function (data) { SignatureRequest.prototype.renderTypedDataV3 = function (data) {
const { domain, message } = JSON.parse(data) const { domain, message } = JSON.parse(data)
return [ return [
h('div.request-signature__typed-container', [ h('div.request-signature__typed-container', [
@ -223,8 +223,8 @@ SignatureRequest.prototype.renderBody = function () {
}), }),
}, [notice]), }, [notice]),
h('div.request-signature__rows', type === 'eth_signTypedData' && version === 'V2' ? h('div.request-signature__rows', type === 'eth_signTypedData' && version === 'V3' ?
this.renderTypedDataV2(data) : this.renderTypedDataV3(data) :
rows.map(({ name, value }) => { rows.map(({ name, value }) => {
if (typeof value === 'boolean') { if (typeof value === 'boolean') {
value = value.toString() value = value.toString()