Skip to content

Commit aaec644

Browse files
committed
Merge branch 'main' into cryptodev-2s/messenger/core-backend
2 parents e979b00 + 17e48a4 commit aaec644

File tree

160 files changed

+3929
-608
lines changed

Some content is hidden

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

160 files changed

+3929
-608
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
## Delegation Team
3333
/packages/gator-permissions-controller @MetaMask/delegation
34+
/packages/eip-7702-internal-rpc-middleware @MetaMask/delegation @MetaMask/core-platform
3435

3536
## Earn Team
3637
/packages/earn-controller @MetaMask/earn

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ Each package in this repository has its own README where you can find installati
3838
- [`@metamask/delegation-controller`](packages/delegation-controller)
3939
- [`@metamask/earn-controller`](packages/earn-controller)
4040
- [`@metamask/eip-5792-middleware`](packages/eip-5792-middleware)
41+
- [`@metamask/eip-7702-internal-rpc-middleware`](packages/eip-7702-internal-rpc-middleware)
4142
- [`@metamask/eip1193-permission-middleware`](packages/eip1193-permission-middleware)
4243
- [`@metamask/ens-controller`](packages/ens-controller)
4344
- [`@metamask/error-reporting-service`](packages/error-reporting-service)
@@ -105,6 +106,7 @@ linkStyle default opacity:0.5
105106
delegation_controller(["@metamask/delegation-controller"]);
106107
earn_controller(["@metamask/earn-controller"]);
107108
eip_5792_middleware(["@metamask/eip-5792-middleware"]);
109+
eip_7702_internal_rpc_middleware(["@metamask/eip-7702-internal-rpc-middleware"]);
108110
eip1193_permission_middleware(["@metamask/eip1193-permission-middleware"]);
109111
ens_controller(["@metamask/ens-controller"]);
110112
error_reporting_service(["@metamask/error-reporting-service"]);

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

packages/account-tree-controller/CHANGELOG.md

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

88
## [Unreleased]
99

10+
## [1.6.0]
11+
12+
### Changed
13+
14+
- Add optional account hidden/pinned state callbacks ([#6910](https://github.com/MetaMask/core/pull/6910))
15+
- Those callbacks can be used migrate existing account state into the tree metadata.
16+
- Bump `@metamask/base-controller` from `^8.4.1` to `^8.4.2` ([#6917](https://github.com/MetaMask/core/pull/6917))
17+
1018
## [1.5.0]
1119

1220
### Changed
@@ -373,7 +381,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
373381
- Initial release ([#5847](https://github.com/MetaMask/core/pull/5847))
374382
- Grouping accounts into 3 main categories: Entropy source, Snap ID, keyring types.
375383

376-
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@1.5.0...HEAD
384+
[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@1.6.0...HEAD
385+
[1.6.0]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@1.5.0...@metamask/account-tree-controller@1.6.0
377386
[1.5.0]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@1.4.2...@metamask/account-tree-controller@1.5.0
378387
[1.4.2]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@1.4.1...@metamask/account-tree-controller@1.4.2
379388
[1.4.1]: https://github.com/MetaMask/core/compare/@metamask/account-tree-controller@1.4.0...@metamask/account-tree-controller@1.4.1

packages/account-tree-controller/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = merge(baseConfig, {
1717
// An object that configures minimum threshold enforcement for coverage results
1818
coverageThreshold: {
1919
global: {
20-
branches: 100,
20+
branches: 98.34,
2121
functions: 100,
2222
lines: 100,
2323
statements: 100,

packages/account-tree-controller/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@metamask/account-tree-controller",
3-
"version": "1.5.0",
3+
"version": "1.6.0",
44
"description": "Controller to group account together based on some pre-defined rules",
55
"keywords": [
66
"MetaMask",
@@ -47,7 +47,7 @@
4747
"test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
4848
},
4949
"dependencies": {
50-
"@metamask/base-controller": "^8.4.1",
50+
"@metamask/base-controller": "^8.4.2",
5151
"@metamask/snaps-sdk": "^9.0.0",
5252
"@metamask/snaps-utils": "^11.0.0",
5353
"@metamask/superstruct": "^3.1.0",

0 commit comments

Comments
 (0)