Skip to content

Commit 1eedb0b

Browse files
committed
Merge branch 'mikesposito/messenger/approval-controller' into mikesposito/messenger/polling-controllers
2 parents 243da17 + 4e2a9ea commit 1eedb0b

File tree

131 files changed

+5303
-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.

131 files changed

+5303
-442
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ linkStyle default opacity:0.5
219219
earn_controller --> transaction_controller;
220220
eip_5792_middleware --> transaction_controller;
221221
eip_5792_middleware --> keyring_controller;
222+
eip_7702_internal_rpc_middleware --> controller_utils;
222223
eip1193_permission_middleware --> chain_agnostic_permission;
223224
eip1193_permission_middleware --> controller_utils;
224225
eip1193_permission_middleware --> json_rpc_engine;

eslint-warning-thresholds.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -287,12 +287,6 @@
287287
"packages/gas-fee-controller/src/determineGasFeeCalculations.ts": {
288288
"jsdoc/tag-lines": 4
289289
},
290-
"packages/json-rpc-engine/src/JsonRpcEngine.test.ts": {
291-
"jest/no-conditional-in-test": 2
292-
},
293-
"packages/json-rpc-engine/src/JsonRpcEngine.ts": {
294-
"@typescript-eslint/prefer-promise-reject-errors": 2
295-
},
296290
"packages/json-rpc-middleware-stream/src/index.test.ts": {
297291
"@typescript-eslint/prefer-promise-reject-errors": 3,
298292
"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
@@ -57,12 +57,12 @@
5757
},
5858
"devDependencies": {
5959
"@metamask/account-api": "^0.12.0",
60-
"@metamask/accounts-controller": "^33.1.1",
60+
"@metamask/accounts-controller": "^33.2.0",
6161
"@metamask/auto-changelog": "^3.4.4",
6262
"@metamask/keyring-api": "^21.0.0",
63-
"@metamask/keyring-controller": "^23.1.1",
64-
"@metamask/multichain-account-service": "^1.6.1",
65-
"@metamask/profile-sync-controller": "^25.1.1",
63+
"@metamask/keyring-controller": "^23.2.0",
64+
"@metamask/multichain-account-service": "^1.6.2",
65+
"@metamask/profile-sync-controller": "^25.1.2",
6666
"@metamask/providers": "^22.1.0",
6767
"@metamask/snaps-controllers": "^14.0.1",
6868
"@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))
@@ -636,7 +638,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
636638

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

639-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
641+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
642+
[33.2.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
640643
[33.1.1]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
641644
[33.1.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
642645
[33.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]

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",
@@ -66,8 +66,8 @@
6666
"devDependencies": {
6767
"@metamask/auto-changelog": "^3.4.4",
6868
"@metamask/controller-utils": "^11.14.1",
69-
"@metamask/keyring-controller": "^23.1.1",
70-
"@metamask/network-controller": "^24.3.0",
69+
"@metamask/keyring-controller": "^23.2.0",
70+
"@metamask/network-controller": "^24.3.1",
7171
"@metamask/providers": "^22.1.0",
7272
"@metamask/snaps-controllers": "^14.0.1",
7373
"@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))
@@ -246,7 +248,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
246248

247249
All changes listed after this point were applied to this package following the monorepo conversion.
248250

249-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
251+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
252+
[6.2.1]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
250253
[6.2.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
251254
[6.1.1]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
252255
[6.1.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]

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))
@@ -190,7 +192,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
190192

191193
All changes listed after this point were applied to this package following the monorepo conversion.
192194

193-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
195+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
196+
[7.1.1]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
194197
[7.1.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
195198
[7.0.3]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
196199
[7.0.2]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]

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",

0 commit comments

Comments
 (0)