Skip to content

Commit 515e9b9

Browse files
committed
Merge branch 'main' into fix/reduce-token-balances-updates
2 parents 5ea27f1 + b1c2e74 commit 515e9b9

File tree

163 files changed

+6696
-8434
lines changed

Some content is hidden

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

163 files changed

+6696
-8434
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
## Accounts Team
1010
/packages/accounts-controller @MetaMask/accounts-engineers
11-
/packages/keyring-controller @MetaMask/accounts-engineers
1211
/packages/multichain-transactions-controller @MetaMask/accounts-engineers
1312

1413
## Assets Team
@@ -75,6 +74,7 @@
7574
/packages/eth-json-rpc-provider @MetaMask/wallet-api-platform-engineers @MetaMask/wallet-framework-engineers
7675
/packages/json-rpc-engine @MetaMask/wallet-api-platform-engineers @MetaMask/wallet-framework-engineers
7776
/packages/json-rpc-middleware-stream @MetaMask/wallet-api-platform-engineers @MetaMask/wallet-framework-engineers
77+
/packages/keyring-controller @MetaMask/accounts-engineers @MetaMask/wallet-framework-engineers
7878
/packages/multichain-network-controller @MetaMask/wallet-framework-engineers @MetaMask/accounts-engineers @MetaMask/metamask-assets
7979
/packages/network-controller @MetaMask/wallet-framework-engineers @MetaMask/metamask-assets
8080
/packages/permission-controller @MetaMask/wallet-api-platform-engineers @MetaMask/wallet-framework-engineers @MetaMask/snaps-devs

.github/workflows/changelog-check.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ on:
66

77
jobs:
88
check_changelog:
9-
uses: MetaMask/github-tools/.github/workflows/changelog-check.yml@91e349d177db2c569e03c7aa69d2acb404b62f75
9+
uses: MetaMask/github-tools/.github/workflows/changelog-check.yml@85fffce169c0fd35028ecde6b38dfb3f932882ec
1010
with:
11+
action-sha: 85fffce169c0fd35028ecde6b38dfb3f932882ec
1112
base-branch: ${{ github.event.pull_request.base.ref }}
1213
head-ref: ${{ github.head_ref }}
1314
labels: ${{ toJSON(github.event.pull_request.labels) }}

eslint-warning-thresholds.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -437,9 +437,6 @@
437437
"packages/polling-controller/src/AbstractPollingController.ts": {
438438
"@typescript-eslint/prefer-readonly": 1
439439
},
440-
"packages/preferences-controller/src/PreferencesController.test.ts": {
441-
"prettier/prettier": 4
442-
},
443440
"packages/queued-request-controller/src/QueuedRequestController.ts": {
444441
"@typescript-eslint/prefer-readonly": 2
445442
},

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": "379.0.0",
3+
"version": "396.0.0",
44
"private": true,
55
"description": "Monorepo for packages shared between MetaMask clients",
66
"repository": {

packages/accounts-controller/CHANGELOG.md

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

88
## [Unreleased]
99

10+
## [28.0.0]
11+
12+
### Added
13+
14+
- Add new `setAccountNameAndSelectAccount` action ([#5714](https://github.com/MetaMask/core/pull/5714))
15+
- Add `entropySource` and `derivationPath` to EVM HD account options ([#5618](https://github.com/MetaMask/core/pull/5618))
16+
1017
### Changed
1118

12-
- Bump `@metamask/base-controller` from ^8.0.0 to ^8.0.1 ([#5722](https://github.com/MetaMask/core/pull/5722))
13-
- **BREAKING:** Bump `@metamask/snaps-controllers` peer dependency from ^9.19.0 to ^11.0.0 ([#5639](https://github.com/MetaMask/core/pull/5639))
14-
- **BREAKING:** Bump `@metamask/providers` peer dependency from ^18.1.0 to ^21.0.0 ([#5639](https://github.com/MetaMask/core/pull/5639))
15-
- Bump `@metamask/snaps-sdk` from ^6.17.1 to ^6.22.0 ([#5639](https://github.com/MetaMask/core/pull/5639))
16-
- Bump `@metamask/snaps-utils` from ^8.10.0 to ^9.2.0 ([#5639](https://github.com/MetaMask/core/pull/5639))
19+
- **BREAKING:** Bump `@metamask/snaps-controllers` peer dependency from `^9.19.0` to `^11.0.0` ([#5639](https://github.com/MetaMask/core/pull/5639))
20+
- **BREAKING:** Bump `@metamask/providers` peer dependency from `^18.1.0` to `^21.0.0` ([#5639](https://github.com/MetaMask/core/pull/5639))
21+
- Bump `@metamask/base-controller` from `^8.0.0` to `^8.0.1` ([#5722](https://github.com/MetaMask/core/pull/5722))
22+
- Bump `@metamask/snaps-sdk` from `^6.17.1` to `^6.22.0` ([#5639](https://github.com/MetaMask/core/pull/5639))
23+
- Bump `@metamask/snaps-utils` from `^8.10.0` to `^9.2.0` ([#5639](https://github.com/MetaMask/core/pull/5639))
24+
- Bump `@metamask/eth-snap-keyring` from `^12.0.0` to `^12.1.1` ([#5565](https://github.com/MetaMask/core/pull/5565))
25+
- Bump `@metamask/keyring-api` from `^17.2.0` to `^17.4.0` ([#5565](https://github.com/MetaMask/core/pull/5565))
26+
- Bump `@metamask/keyring-internal-api` from `^6.0.0` to `^6.0.1` ([#5565](https://github.com/MetaMask/core/pull/5565))
27+
28+
### Fixed
29+
30+
- Do not fire events during `update` blocks ([#5555](https://github.com/MetaMask/core/pull/5555))
31+
- Prevent unnecessary state updates when updating `InternalAccount.metadata.snap` ([#5735](https://github.com/MetaMask/core/pull/5735))
1732

1833
## [27.0.0]
1934

@@ -513,7 +528,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
513528

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

516-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
531+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
532+
[28.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
517533
[27.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
518534
[26.1.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
519535
[26.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": "27.0.0",
3+
"version": "28.0.0",
44
"description": "Manages internal accounts",
55
"keywords": [
66
"MetaMask",
@@ -63,8 +63,8 @@
6363
},
6464
"devDependencies": {
6565
"@metamask/auto-changelog": "^3.4.4",
66-
"@metamask/keyring-controller": "^21.0.4",
67-
"@metamask/network-controller": "^23.2.0",
66+
"@metamask/keyring-controller": "^21.0.6",
67+
"@metamask/network-controller": "^23.4.0",
6868
"@metamask/providers": "^21.0.0",
6969
"@metamask/snaps-controllers": "^11.2.1",
7070
"@types/jest": "^27.4.1",

0 commit comments

Comments
 (0)