Merge branch 'develop' into feature/custom-nonce

.eslintrc.js

@@ -6,21 +6,15 @@ module.exports = {
     '@metamask/eslint-config/config/nodejs',
     '@metamask/eslint-config/config/typescript',
   ],
-  ignorePatterns: [
-    '!.eslintrc.js',
-    '!jest.config.js',
-    'node_modules',
-    'dist',
-    'docs',
-    'coverage',
-    '*.d.ts',
-  ],
-  overrides: [{
-    files: ['*.js'],
-    parserOptions: {
-      sourceType: 'script',
+  ignorePatterns: ['!.eslintrc.js', '!jest.config.js', 'node_modules', 'dist', 'docs', 'coverage', '*.d.ts'],
+  overrides: [
+    {
+      files: ['*.js'],
+      parserOptions: {
+        sourceType: 'script',
+      },
     },
-  }],
+  ],
   rules: {
     'no-shadow': 'off',
     '@typescript-eslint/no-shadow': 'error',
@@ -37,28 +31,28 @@ module.exports = {
     '@typescript-eslint/member-delimiter-style': [
       'error',
       {
-        'multiline': {
-          'delimiter': 'semi',
-          'requireLast': true,
+        multiline: {
+          delimiter: 'semi',
+          requireLast: true,
         },
-        'singleline': {
-          'delimiter': 'semi',
-          'requireLast': false,
+        singleline: {
+          delimiter: 'semi',
+          requireLast: false,
         },
       },
     ],
     '@typescript-eslint/prefer-optional-chain': 'off',
     '@typescript-eslint/space-before-function-paren': [
       'error',
       {
-        'anonymous': 'always',
-        'named': 'never',
-        'asyncArrow': 'always',
+        anonymous: 'always',
+        named: 'never',
+        asyncArrow: 'always',
       },
     ],
 
     'accessor-pairs': 'off',
-    'camelcase': 'off',
+    camelcase: 'off',
     'consistent-return': 'off',
     'default-case': 'off',
     'function-paren-newline': 'off',
@@ -76,7 +70,7 @@ module.exports = {
     'no-param-reassign': 'off',
     'no-prototype-builtins': 'off',
     'no-useless-escape': 'off',
-    'radix': 'off',
+    radix: 'off',
     'require-atomic-updates': 'off',
 
     'node/no-extraneous-require': 'off',

CHANGELOG.md

@@ -6,6 +6,51 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [6.1.0] - 2021-03-10
+
+### Added
+
+- Add Base Controller v2 ([#358](https://github.com/MetaMask/controllers/pull/358))
+- Add `babel-runtime` dependency required by `ethjs-query` ([#341](https://github.com/MetaMask/controllers/pull/341))
+- Add Dependabot config ([#343](https://github.com/MetaMask/controllers/pull/343))
+
+### Changed
+
+- Add chainId to every transaction ([#349](https://github.com/MetaMask/controllers/pull/349))
+- Add normalizeTokenTx for incoming transactions ([#380](https://github.com/MetaMask/controllers/pull/380))
+- Bump elliptic from 6.5.3 to 6.5.4 ([#383](https://github.com/MetaMask/controllers/pull/383))
+- Update prettier from v2.1.1 to v2.2.1 ([#376](https://github.com/MetaMask/controllers/pull/376))
+- Remove AlethioTransactionMeta ([#374](https://github.com/MetaMask/controllers/pull/374))
+- Improve JSON types ([#373](https://github.com/MetaMask/controllers/pull/373))
+- Add BaseControllerV2 state metadata ([#371](https://github.com/MetaMask/controllers/pull/371))
+- Update to TypeScript 4.1 ([#370](https://github.com/MetaMask/controllers/pull/370))
+- Constrain BaseController state to be valid JSON ([#366](https://github.com/MetaMask/controllers/pull/366))
+- Update ESLint config to v5 ([#368](https://github.com/MetaMask/controllers/pull/368))
+- Use `unknown` rather than `any` for BaseController state ([#365](https://github.com/MetaMask/controllers/pull/365))
+- BaseController send patches to state subscribers ([#363](https://github.com/MetaMask/controllers/pull/363))
+- TransactionController gas and approve transaction improvements ([#350](https://github.com/MetaMask/controllers/pull/350))
+- Extract CryptoCompare API to a separate module ([#353](https://github.com/MetaMask/controllers/pull/353))
+- Move tests alongside code under test ([#354](https://github.com/MetaMask/controllers/pull/354))
+- Bump @metamask/contract-metadata from 1.22.0 to 1.23.0 ([#357](https://github.com/MetaMask/controllers/pull/357))
+- Remove Alethio to get incoming token transactions, using etherscan instead ([#351](https://github.com/MetaMask/controllers/pull/351))
+- Prevent `ApprovalController` counting mismatch ([#356](https://github.com/MetaMask/controllers/pull/356))
+- Update `sinon` and `@types/sinon` to latest versions ([#352](https://github.com/MetaMask/controllers/pull/352))
+- Fix `tsconfig.json` indentation ([#355](https://github.com/MetaMask/controllers/pull/355))
+- Replace `fetch-mock` with `nock` ([#340](https://github.com/MetaMask/controllers/pull/340))
+- Update `ethereumjs-wallet` from v0.6.5 to v1.0.1 ([#347](https://github.com/MetaMask/controllers/pull/347))
+- Update `@metamask/eslint-config` from v3 to v4.1.0 ([#344](https://github.com/MetaMask/controllers/pull/344))
+- Update `uuid` from `v3.3.3` to `v8.3.2` ([#346](https://github.com/MetaMask/controllers/pull/346))
+- Update approval controller test import ([#339](https://github.com/MetaMask/controllers/pull/339))
+- Update `typedoc` ([#342](https://github.com/MetaMask/controllers/pull/342))
+- Remove unused test module ([#338](https://github.com/MetaMask/controllers/pull/338))
+- Replace `await-semaphore` with `async-mutex` ([#334](https://github.com/MetaMask/controllers/pull/334))
+- Update `eth-json-rpc-filters` in lockfile ([#336](https://github.com/MetaMask/controllers/pull/336))
+
+### Fixed
+
+- Fix AbstractMessageManager error ([#367](https://github.com/MetaMask/controllers/pull/367))
+- Enforce the usage of `chainId` instead of `networkId` in `NetworkController` ([#324](https://github.com/MetaMask/controllers/pull/324))
+
 ## [6.0.1] - 2021-02-05
 
 ### Changed
@@ -174,7 +219,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Remove shapeshift controller (#209)
 
-[Unreleased]:https://github.com/MetaMask/controllers/compare/v6.0.1...HEAD
+[Unreleased]:https://github.com/MetaMask/controllers/compare/v6.1.0...HEAD
+[6.0.1]:https://github.com/MetaMask/controllers/compare/v6.0.1...v6.1.0
 [6.0.1]:https://github.com/MetaMask/controllers/compare/v6.0.0...v6.0.1
 [6.0.0]:https://github.com/MetaMask/controllers/compare/v5.1.0...v6.0.0
 [5.1.0]:https://github.com/MetaMask/controllers/compare/v5.0.0...v5.1.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/controllers",
-  "version": "6.0.1",
+  "version": "6.1.0",
   "description": "Collection of platform-agnostic modules for creating secure data models for cryptocurrency wallets",
   "license": "MIT",
   "files": [
@@ -15,8 +15,8 @@
     "prepublishOnly": "yarn build",
     "lint": "eslint --ext js,ts .",
     "test": "jest --coverage",
-    "format": "prettier **/*.ts **/*.js --check --ignore-path=.gitignore",
-    "format:fix": "prettier **/*.ts **/*.js --write --ignore-path=.gitignore",
+    "format": "prettier '**/*.ts' '**/*.js' --check --ignore-path=.gitignore",
+    "format:fix": "prettier '**/*.ts' '**/*.js' --write --ignore-path=.gitignore",
     "build": "rm -rf dist && tsc",
     "build:watch": "yarn build && tsc -w",
     "build:link": "yarn build && cd dist && yarn link && rm -rf node_modules && cd ..",