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

Only import used sig-util exports

Browse Source
This commit is contained in:
Erik Marks 2020-11-09 08:59:44 -08:00
parent 6aa6052318
commit 0555cb856e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@ import EventEmitter from 'events'
import assert from 'assert' import assert from 'assert'
import ObservableStore from 'obs-store' import ObservableStore from 'obs-store'
import { ethErrors } from 'eth-json-rpc-errors' import { ethErrors } from 'eth-json-rpc-errors'
import * as sigUtil from 'eth-sig-util' import { typedSignatureHash, TYPED_MESSAGE_SCHEMA } from 'eth-sig-util'
import { isValidAddress } from 'ethereumjs-util' import { isValidAddress } from 'ethereumjs-util'
import log from 'loglevel' import log from 'loglevel'
import jsonschema from 'jsonschema' import jsonschema from 'jsonschema'
@ -164,7 +164,7 @@ export default class TypedMessageManager extends EventEmitter {
case 'V1': case 'V1':
assert.ok(Array.isArray(params.data), '"params.data" must be an array.') assert.ok(Array.isArray(params.data), '"params.data" must be an array.')
assert.doesNotThrow(() => { assert.doesNotThrow(() => {
sigUtil.typedSignatureHash(params.data) typedSignatureHash(params.data)
}, 'Signing data must be valid EIP-712 typed data.') }, 'Signing data must be valid EIP-712 typed data.')
break break
case 'V3': case 'V3':
@ -178,10 +178,7 @@ export default class TypedMessageManager extends EventEmitter {
assert.doesNotThrow(() => { assert.doesNotThrow(() => {
data = JSON.parse(params.data) data = JSON.parse(params.data)
}, '"data" must be a valid JSON string.') }, '"data" must be a valid JSON string.')
const validation = jsonschema.validate( const validation = jsonschema.validate(data, TYPED_MESSAGE_SCHEMA)
data,
sigUtil.TYPED_MESSAGE_SCHEMA,
)
assert.ok( assert.ok(
data.primaryType in data.types, data.primaryType in data.types,
`Primary type of "${data.primaryType}" has no type definition.`, `Primary type of "${data.primaryType}" has no type definition.`,