mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Merge pull request #7304 from MetaMask/routeTypedSignaturesToKeyrings
Move signTypedData signing out to keyrings
This commit is contained in:
Dan Finlay
GitHub
commit
5c8048fcc1
@ -53,10 +53,8 @@ const seedPhraseVerifier = require('./lib/seed-phrase-verifier')
|
||||
const log = require('loglevel')
|
||||
const TrezorKeyring = require('eth-trezor-keyring')
|
||||
const LedgerBridgeKeyring = require('eth-ledger-bridge-keyring')
|
||||
const HW_WALLETS_KEYRINGS = [TrezorKeyring.type, LedgerBridgeKeyring.type]
|
||||
const EthQuery = require('eth-query')
|
||||
const ethUtil = require('ethereumjs-util')
|
||||
const sigUtil = require('eth-sig-util')
|
||||
const contractMap = require('eth-contract-metadata')
|
||||
const {
|
||||
AddressBookController,
|
||||
@ -1168,28 +1166,16 @@ module.exports = class MetamaskController extends EventEmitter {
|
||||
const version = msgParams.version
|
||||
try {
|
||||
const cleanMsgParams = await this.typedMessageManager.approveMessage(msgParams)
|
||||
const address = sigUtil.normalize(cleanMsgParams.from)
|
||||
const keyring = await this.keyringController.getKeyringForAccount(address)
|
||||
let signature
|
||||
// HW Wallet keyrings don't expose private keys
|
||||
// so we need to handle it separately
|
||||
if (!HW_WALLETS_KEYRINGS.includes(keyring.type)) {
|
||||
const wallet = keyring._getWalletForAccount(address)
|
||||
const privKey = ethUtil.toBuffer(wallet.getPrivateKey())
|
||||
switch (version) {
|
||||
case 'V1':
|
||||
signature = sigUtil.signTypedDataLegacy(privKey, { data: cleanMsgParams.data })
|
||||
break
|
||||
case 'V3':
|
||||
signature = sigUtil.signTypedData(privKey, { data: JSON.parse(cleanMsgParams.data) })
|
||||
break
|
||||
case 'V4':
|
||||
signature = sigUtil.signTypedData_v4(privKey, { data: JSON.parse(cleanMsgParams.data) })
|
||||
break
|
||||
|
||||
// For some reason every version after V1 used stringified params.
|
||||
if (version !== 'V1') {
|
||||
// But we don't have to require that. We can stop suggesting it now:
|
||||
if (typeof cleanMsgParams.data === 'string') {
|
||||
cleanMsgParams.data = JSON.parse(cleanMsgParams.data)
|
||||
}
|
||||
} else {
|
||||
signature = await keyring.signTypedData(address, cleanMsgParams.data)
|
||||
}
|
||||
|
||||
const signature = await this.keyringController.signTypedMessage(cleanMsgParams, { version })
|
||||
this.typedMessageManager.setMsgStatusSigned(msgId, signature)
|
||||
return this.getState()
|
||||
} catch (error) {
|
||||
|
||||
@ -91,7 +91,7 @@
|
||||
"eth-json-rpc-filters": "^4.1.0",
|
||||
"eth-json-rpc-infura": "^4.0.1",
|
||||
"eth-json-rpc-middleware": "^4.2.0",
|
||||
"eth-keyring-controller": "^5.1.0",
|
||||
"eth-keyring-controller": "^5.3.0",
|
||||
"eth-ledger-bridge-keyring": "^0.2.0",
|
||||
"eth-method-registry": "^1.2.0",
|
||||
"eth-phishing-detect": "^1.1.4",
|
||||
@ -203,7 +203,6 @@
|
||||
"css-loader": "^2.1.1",
|
||||
"deep-freeze-strict": "^1.1.1",
|
||||
"del": "^3.0.0",
|
||||
"read-installed": "^4.0.3",
|
||||
"deps-dump": "^1.1.0",
|
||||
"envify": "^4.0.0",
|
||||
"enzyme": "^3.4.4",
|
||||
@ -266,6 +265,7 @@
|
||||
"radgrad-jsdoc-template": "^1.1.3",
|
||||
"react-devtools": "^3.6.1",
|
||||
"react-test-renderer": "^15.6.2",
|
||||
"read-installed": "^4.0.3",
|
||||
"redux-mock-store": "^1.5.3",
|
||||
"redux-test-utils": "^0.2.2",
|
||||
"remote-redux-devtools": "^0.5.16",
|
||||
|
||||
45
yarn.lock
45
yarn.lock
@ -9744,13 +9744,14 @@ eth-hd-keyring@^2.0.0:
|
||||
events "^1.1.1"
|
||||
xtend "^4.0.1"
|
||||
|
||||
eth-hd-keyring@^2.1.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/eth-hd-keyring/-/eth-hd-keyring-2.1.0.tgz#da93224f791fb1d9220598f7c96f04181dff6ace"
|
||||
integrity sha512-1ZcPmj4h18tmwG7RIturC2lpeimuiAyUGW9Ic5ztCFNeRAcfiQ3ic7sENWhzqbSgth9xkAMIHqM8IY31VJviZg==
|
||||
eth-hd-keyring@^3.4.0:
|
||||
version "3.4.0"
|
||||
resolved "https://registry.yarnpkg.com/eth-hd-keyring/-/eth-hd-keyring-3.4.0.tgz#288e73041f2b3f047b4151fb4b5ab5ad5710b9a6"
|
||||
integrity sha512-MMKSSwDWuEfItEM/826LHrs2HVjy57qQQfcgSxIYOCJY0vykw++LH8d6QJOBrGFe+xu/gtbHBRMURrFGdqfevw==
|
||||
dependencies:
|
||||
bip39 "^2.2.0"
|
||||
eth-sig-util "^2.0.1"
|
||||
eth-sig-util "^2.4.4"
|
||||
eth-simple-keyring "^3.4.0"
|
||||
ethereumjs-abi "^0.6.5"
|
||||
ethereumjs-util "^5.1.1"
|
||||
ethereumjs-wallet "^0.6.0"
|
||||
@ -9853,17 +9854,17 @@ eth-keyring-controller@^5.0.1:
|
||||
obs-store "^4.0.3"
|
||||
promise-filter "^1.1.0"
|
||||
|
||||
eth-keyring-controller@^5.1.0:
|
||||
version "5.1.0"
|
||||
resolved "https://registry.yarnpkg.com/eth-keyring-controller/-/eth-keyring-controller-5.1.0.tgz#1dbe539f6ca483d6f2fa16b33b00d66eeb2de974"
|
||||
integrity sha512-NCXzYIBHJo5o8XoyPdGRLRLTi2pitJKlZPcDO+Un4wbt3djrvWH8adopLH+kNw9zUfk2C5OQqUQ4/UibSvanxA==
|
||||
eth-keyring-controller@^5.3.0:
|
||||
version "5.3.0"
|
||||
resolved "https://registry.yarnpkg.com/eth-keyring-controller/-/eth-keyring-controller-5.3.0.tgz#8d85a67b894360ab7d601222ca71df8ed5f456c6"
|
||||
integrity sha512-aoqYjKUbdOSgS1s63IsTp69QAMtLPTCqR4VAbCULps71o3yuaA9JRx2W+GAxqVNBtIdyZllxoOJlvErkO4iWNw==
|
||||
dependencies:
|
||||
bip39 "^2.4.0"
|
||||
bluebird "^3.5.0"
|
||||
browser-passworder "^2.0.3"
|
||||
eth-hd-keyring "^2.1.0"
|
||||
eth-hd-keyring "^3.4.0"
|
||||
eth-sig-util "^1.4.0"
|
||||
eth-simple-keyring "^2.1.0"
|
||||
eth-simple-keyring "^3.4.0"
|
||||
ethereumjs-util "^5.1.2"
|
||||
loglevel "^1.5.0"
|
||||
obs-store "^4.0.3"
|
||||
@ -9969,6 +9970,18 @@ eth-sig-util@^2.1.0:
|
||||
tweetnacl "^1.0.0"
|
||||
tweetnacl-util "^0.15.0"
|
||||
|
||||
eth-sig-util@^2.4.4, eth-sig-util@^2.5.0:
|
||||
version "2.5.0"
|
||||
resolved "https://registry.yarnpkg.com/eth-sig-util/-/eth-sig-util-2.5.0.tgz#1018cf8bef2fe275ecbd526cf3248757b0880053"
|
||||
integrity sha512-ahApxr+e1cls/GwcFSGsgRLrMqG6D6cBnK9CRHhx97O/s9ow+URIxbPvov8jfE70ZnNBdHMircoSCpi1b4QHjA==
|
||||
dependencies:
|
||||
buffer "^5.2.1"
|
||||
elliptic "^6.4.0"
|
||||
ethereumjs-abi "0.6.5"
|
||||
ethereumjs-util "^5.1.1"
|
||||
tweetnacl "^1.0.0"
|
||||
tweetnacl-util "^0.15.0"
|
||||
|
||||
eth-simple-keyring@^2.0.0:
|
||||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/eth-simple-keyring/-/eth-simple-keyring-2.0.0.tgz#ef1e97c4aebb7229dce9c0ec5cc84efcd3a76395"
|
||||
@ -9981,12 +9994,12 @@ eth-simple-keyring@^2.0.0:
|
||||
events "^1.1.1"
|
||||
xtend "^4.0.1"
|
||||
|
||||
eth-simple-keyring@^2.1.0:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/eth-simple-keyring/-/eth-simple-keyring-2.1.0.tgz#bfff8f7c438a9b5164e995db1cccbbdb9e27752f"
|
||||
integrity sha512-31emUxGHOVhYzlPoEGyfrn1Usi2ZI9qDqMnDHwG0R0HdIuF/I10qlf401MkiD9lcMDuvgJkLpqqAvGxrKrFCwA==
|
||||
eth-simple-keyring@^3.4.0:
|
||||
version "3.4.0"
|
||||
resolved "https://registry.yarnpkg.com/eth-simple-keyring/-/eth-simple-keyring-3.4.0.tgz#01464234b070af42a343a3c451dd58b00ae1a042"
|
||||
integrity sha512-g/ObWqWaTHikrhhm7fNinpkkpEPqBRz02oBXcH81mc3VFkOLb3pjfvNg1Da6Jh+A4wA0kBE4vkiiG7BUwF1zNg==
|
||||
dependencies:
|
||||
eth-sig-util "^2.0.1"
|
||||
eth-sig-util "^2.5.0"
|
||||
ethereumjs-abi "^0.6.5"
|
||||
ethereumjs-util "^5.1.1"
|
||||
ethereumjs-wallet "^0.6.0"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user