1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 09:57:02 +01:00

Merge branch 'master' into Version-v9.7.0

This commit is contained in:
ryanml 2021-06-21 12:15:52 -07:00 committed by GitHub
commit 40c8a1a984
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions

View File

@ -233,6 +233,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Ensure permission log will only store JSON-able data ([#10524](https://github.com/MetaMask/metamask-extension/pull/10524))
- Replace logic for eth swap token in fetchQuotesAndSetQuoteState with getSwapsEthToken call ([#10624](https://github.com/MetaMask/metamask-extension/pull/10624))
## [9.6.1]
### Fixed
- [#11309](https://github.com/MetaMask/metamask-extension/pull/11309): Fixed signTypeData parameter validation issue
## [9.6.0]
### Added
- [#10905](https://github.com/MetaMask/metamask-extension/pull/10905): Implemented basic switchEthereumChain feature
@ -2530,7 +2534,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Added the ability to restore accounts from seed words.
[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v9.7.0...HEAD
[9.7.0]: https://github.com/MetaMask/metamask-extension/compare/v9.6.0...v9.7.0
[9.7.0]: https://github.com/MetaMask/metamask-extension/compare/v9.6.1...v9.7.0
[9.6.1]: https://github.com/MetaMask/metamask-extension/compare/v9.6.0...v9.6.1
[9.6.0]: https://github.com/MetaMask/metamask-extension/compare/v9.5.9...v9.6.0
[9.5.9]: https://github.com/MetaMask/metamask-extension/compare/v9.5.8...v9.5.9
[9.5.8]: https://github.com/MetaMask/metamask-extension/compare/v9.5.7...v9.5.8

View File

@ -1,5 +1,5 @@
import EventEmitter from 'events';
import { strict as assert } from 'assert';
import assert from 'assert';
import { ObservableStore } from '@metamask/obs-store';
import { ethErrors } from 'eth-rpc-errors';
import { typedSignatureHash, TYPED_MESSAGE_SCHEMA } from 'eth-sig-util';
@ -177,7 +177,7 @@ export default class TypedMessageManager extends EventEmitter {
break;
case 'V3':
case 'V4': {
assert.equal(
assert.strictEqual(
typeof params.data,
'string',
'"params.data" must be a string.',
@ -191,7 +191,7 @@ export default class TypedMessageManager extends EventEmitter {
data.primaryType in data.types,
`Primary type of "${data.primaryType}" has no type definition.`,
);
assert.equal(
assert.strictEqual(
validation.errors.length,
0,
'Signing data must conform to EIP-712 schema. See https://git.io/fNtcx.',