Skip to content

Commit f081c14

Browse files
committed
Merge remote-tracking branch 'origin/main' into mikesposito/messenger/preview
* origin/main: feat: `JsonRpcEngineV2` (#6176) Release 641.0.0 (#6940)
2 parents 98a7d21 + e4f2a09 commit f081c14

File tree

130 files changed

+5296
-442
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+5296
-442
lines changed

eslint-warning-thresholds.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -284,12 +284,6 @@
284284
"packages/gas-fee-controller/src/determineGasFeeCalculations.ts": {
285285
"jsdoc/tag-lines": 4
286286
},
287-
"packages/json-rpc-engine/src/JsonRpcEngine.test.ts": {
288-
"jest/no-conditional-in-test": 2
289-
},
290-
"packages/json-rpc-engine/src/JsonRpcEngine.ts": {
291-
"@typescript-eslint/prefer-promise-reject-errors": 2
292-
},
293287
"packages/json-rpc-middleware-stream/src/index.test.ts": {
294288
"@typescript-eslint/prefer-promise-reject-errors": 3,
295289
"no-empty-function": 1

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metamask/core-monorepo",
3-
"version": "640.0.0",
3+
"version": "641.0.0",
44
"private": true,
55
"description": "Monorepo for packages shared between MetaMask clients",
66
"repository": {

packages/account-tree-controller/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@
5858
},
5959
"devDependencies": {
6060
"@metamask/account-api": "^0.12.0",
61-
"@metamask/accounts-controller": "^33.1.1",
61+
"@metamask/accounts-controller": "^33.2.0",
6262
"@metamask/auto-changelog": "^3.4.4",
6363
"@metamask/keyring-api": "^21.0.0",
64-
"@metamask/keyring-controller": "^23.1.1",
65-
"@metamask/multichain-account-service": "^1.6.1",
66-
"@metamask/profile-sync-controller": "^25.1.1",
64+
"@metamask/keyring-controller": "^23.2.0",
65+
"@metamask/multichain-account-service": "^1.6.2",
66+
"@metamask/profile-sync-controller": "^25.1.2",
6767
"@metamask/providers": "^22.1.0",
6868
"@metamask/snaps-controllers": "^14.0.1",
6969
"@types/jest": "^27.4.1",

packages/accounts-controller/CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [33.2.0]
11+
1012
### Added
1113

1214
- Add a `getAccounts` method (and its associated action) that is the plural version of `getAccount` ([#6927](https://github.com/MetaMask/core/pull/6927))
@@ -638,7 +640,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
638640

639641
- Initial release ([#1637](https://github.com/MetaMask/core/pull/1637))
640642

641-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@33.1.1...HEAD
643+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@33.2.0...HEAD
644+
[33.2.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@33.1.1...@metamask/accounts-controller@33.2.0
642645
[33.1.1]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@33.1.0...@metamask/accounts-controller@33.1.1
643646
[33.1.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@33.0.0...@metamask/accounts-controller@33.1.0
644647
[33.0.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@32.0.2...@metamask/accounts-controller@33.0.0

packages/accounts-controller/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metamask/accounts-controller",
3-
"version": "33.1.1",
3+
"version": "33.2.0",
44
"description": "Manages internal accounts",
55
"keywords": [
66
"MetaMask",
@@ -67,8 +67,8 @@
6767
"devDependencies": {
6868
"@metamask/auto-changelog": "^3.4.4",
6969
"@metamask/controller-utils": "^11.14.1",
70-
"@metamask/keyring-controller": "^23.1.1",
71-
"@metamask/network-controller": "^24.3.0",
70+
"@metamask/keyring-controller": "^23.2.0",
71+
"@metamask/network-controller": "^24.3.1",
7272
"@metamask/providers": "^22.1.0",
7373
"@metamask/snaps-controllers": "^14.0.1",
7474
"@types/jest": "^27.4.1",

packages/address-book-controller/CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [6.2.1]
11+
1012
### Changed
1113

1214
- Bump `@metamask/base-controller` from `^8.4.1` to `^8.4.2` ([#6917](https://github.com/MetaMask/core/pull/6917))
@@ -248,7 +250,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
248250

249251
All changes listed after this point were applied to this package following the monorepo conversion.
250252

251-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/address-book-controller@6.2.0...HEAD
253+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/address-book-controller@6.2.1...HEAD
254+
[6.2.1]: https://github.com/MetaMask/core/compare/@metamask/address-book-controller@6.2.0...@metamask/address-book-controller@6.2.1
252255
[6.2.0]: https://github.com/MetaMask/core/compare/@metamask/address-book-controller@6.1.1...@metamask/address-book-controller@6.2.0
253256
[6.1.1]: https://github.com/MetaMask/core/compare/@metamask/address-book-controller@6.1.0...@metamask/address-book-controller@6.1.1
254257
[6.1.0]: https://github.com/MetaMask/core/compare/@metamask/address-book-controller@6.0.3...@metamask/address-book-controller@6.1.0

packages/address-book-controller/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metamask/address-book-controller",
3-
"version": "6.2.0",
3+
"version": "6.2.1",
44
"description": "Manages a list of recipient addresses associated with nicknames",
55
"keywords": [
66
"MetaMask",

packages/announcement-controller/CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [7.1.1]
11+
1012
### Changed
1113

1214
- Bump `@metamask/base-controller` from `^8.4.1` to `^8.4.2` ([#6917](https://github.com/MetaMask/core/pull/6917))
@@ -192,7 +194,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
192194

193195
All changes listed after this point were applied to this package following the monorepo conversion.
194196

195-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/announcement-controller@7.1.0...HEAD
197+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/announcement-controller@7.1.1...HEAD
198+
[7.1.1]: https://github.com/MetaMask/core/compare/@metamask/announcement-controller@7.1.0...@metamask/announcement-controller@7.1.1
196199
[7.1.0]: https://github.com/MetaMask/core/compare/@metamask/announcement-controller@7.0.3...@metamask/announcement-controller@7.1.0
197200
[7.0.3]: https://github.com/MetaMask/core/compare/@metamask/announcement-controller@7.0.2...@metamask/announcement-controller@7.0.3
198201
[7.0.2]: https://github.com/MetaMask/core/compare/@metamask/announcement-controller@7.0.1...@metamask/announcement-controller@7.0.2

packages/announcement-controller/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metamask/announcement-controller",
3-
"version": "7.1.0",
3+
"version": "7.1.1",
44
"description": "Manages in-app announcements",
55
"keywords": [
66
"MetaMask",

packages/app-metadata-controller/CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [1.1.1]
11+
1012
### Changed
1113

1214
- Bump `@metamask/base-controller` from `^8.4.1` to `^8.4.2` ([#6917](https://github.com/MetaMask/core/pull/6917))
@@ -29,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2931

3032
- Initial release ([#5577](https://github.com/MetaMask/core/pull/5577))
3133

32-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/app-metadata-controller@1.1.0...HEAD
34+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/app-metadata-controller@1.1.1...HEAD
35+
[1.1.1]: https://github.com/MetaMask/core/compare/@metamask/app-metadata-controller@1.1.0...@metamask/app-metadata-controller@1.1.1
3336
[1.1.0]: https://github.com/MetaMask/core/compare/@metamask/app-metadata-controller@1.0.0...@metamask/app-metadata-controller@1.1.0
3437
[1.0.0]: https://github.com/MetaMask/core/releases/tag/@metamask/app-metadata-controller@1.0.0

0 commit comments

Comments
 (0)