Skip to content

Commit 241e6a0

Browse files
mikespositomikesposito
committed
Merge branch 'main' into mikesposito/messenger/assets-controllers
2 parents 65a9c08 + 2bdfdea commit 241e6a0

File tree

207 files changed

+3681
-2702
lines changed

Some content is hidden

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

207 files changed

+3681
-2702
lines changed

‎.github/CODEOWNERS‎

Lines changed: 183 additions & 172 deletions
Large diffs are not rendered by default.

‎.github/workflows/changelog-check.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ name: Check Changelog
33
on:
44
pull_request:
55
types: [opened, synchronize, labeled, unlabeled]
6+
merge_group:
67

78
jobs:
89
check_changelog:
10+
if: github.event_name != 'merge_group'
911
uses: MetaMask/github-tools/.github/workflows/changelog-check.yml@fc6fe1a3fb591f6afa61f0dbbe7698bd50fab9c7
1012
with:
1113
action-sha: fc6fe1a3fb591f6afa61f0dbbe7698bd50fab9c7

‎.github/workflows/ensure-blocking-pr-labels-absent.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ on:
66
- synchronize
77
- labeled
88
- unlabeled
9+
merge_group:
910

1011
jobs:
1112
ensure-blocking-pr-labels-absent:
13+
if: github.event_name != 'merge_group'
1214
runs-on: ubuntu-latest
1315
permissions:
1416
pull-requests: read

‎.github/workflows/main.yml‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches: [main]
66
pull_request:
7+
merge_group:
78

89
concurrency:
910
group: ${{ github.workflow }}-${{ github.ref }}
@@ -23,17 +24,17 @@ jobs:
2324
run: ${{ steps.download-actionlint.outputs.executable }} -color
2425
shell: bash
2526

26-
analyse-code:
27-
name: Code scanner
28-
needs: check-workflows
29-
uses: ./.github/workflows/security-code-scanner.yml
30-
permissions:
31-
actions: read
32-
contents: read
33-
security-events: write
34-
secrets:
35-
SECURITY_SCAN_METRICS_TOKEN: ${{ secrets.SECURITY_SCAN_METRICS_TOKEN }}
36-
APPSEC_BOT_SLACK_WEBHOOK: ${{ secrets.APPSEC_BOT_SLACK_WEBHOOK }}
27+
# analyse-code:
28+
# name: Code scanner
29+
# needs: check-workflows
30+
# uses: ./.github/workflows/security-code-scanner.yml
31+
# permissions:
32+
# actions: read
33+
# contents: read
34+
# security-events: write
35+
# secrets:
36+
# SECURITY_SCAN_METRICS_TOKEN: ${{ secrets.SECURITY_SCAN_METRICS_TOKEN }}
37+
# APPSEC_BOT_SLACK_WEBHOOK: ${{ secrets.APPSEC_BOT_SLACK_WEBHOOK }}
3738

3839
lint-build-test:
3940
name: Lint, build, and test
@@ -76,7 +77,7 @@ jobs:
7677
name: All jobs complete
7778
runs-on: ubuntu-latest
7879
needs:
79-
- analyse-code
80+
# - analyse-code
8081
- lint-build-test
8182
outputs:
8283
passed: ${{ steps.set-output.outputs.passed }}

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
lts/*
1+
v24.7.0

‎README.md‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,18 +148,23 @@ linkStyle default opacity:0.5
148148
transaction_controller(["@metamask/transaction-controller"]);
149149
user_operation_controller(["@metamask/user-operation-controller"]);
150150
account_tree_controller --> base_controller;
151+
account_tree_controller --> messenger;
151152
account_tree_controller --> accounts_controller;
152153
account_tree_controller --> keyring_controller;
153154
account_tree_controller --> multichain_account_service;
154155
account_tree_controller --> profile_sync_controller;
155156
accounts_controller --> base_controller;
157+
accounts_controller --> messenger;
156158
accounts_controller --> controller_utils;
157159
accounts_controller --> keyring_controller;
158160
accounts_controller --> network_controller;
159161
address_book_controller --> base_controller;
160162
address_book_controller --> controller_utils;
163+
address_book_controller --> messenger;
161164
announcement_controller --> base_controller;
165+
announcement_controller --> messenger;
162166
app_metadata_controller --> base_controller;
167+
app_metadata_controller --> messenger;
163168
approval_controller --> base_controller;
164169
approval_controller --> messenger;
165170
assets_controllers --> base_controller;
@@ -203,17 +208,20 @@ linkStyle default opacity:0.5
203208
chain_agnostic_permission --> network_controller;
204209
chain_agnostic_permission --> permission_controller;
205210
composable_controller --> base_controller;
211+
composable_controller --> messenger;
206212
composable_controller --> json_rpc_engine;
207213
core_backend --> base_controller;
208214
core_backend --> controller_utils;
209215
core_backend --> profile_sync_controller;
210216
core_backend --> accounts_controller;
211217
core_backend --> keyring_controller;
212218
delegation_controller --> base_controller;
219+
delegation_controller --> messenger;
213220
delegation_controller --> accounts_controller;
214221
delegation_controller --> keyring_controller;
215222
earn_controller --> base_controller;
216223
earn_controller --> controller_utils;
224+
earn_controller --> messenger;
217225
earn_controller --> account_tree_controller;
218226
earn_controller --> network_controller;
219227
earn_controller --> transaction_controller;
@@ -226,8 +234,10 @@ linkStyle default opacity:0.5
226234
eip1193_permission_middleware --> permission_controller;
227235
ens_controller --> base_controller;
228236
ens_controller --> controller_utils;
237+
ens_controller --> messenger;
229238
ens_controller --> network_controller;
230239
error_reporting_service --> base_controller;
240+
error_reporting_service --> messenger;
231241
eth_block_tracker --> eth_json_rpc_provider;
232242
eth_block_tracker --> json_rpc_engine;
233243
eth_json_rpc_middleware --> eth_block_tracker;
@@ -241,12 +251,16 @@ linkStyle default opacity:0.5
241251
gas_fee_controller --> polling_controller;
242252
gas_fee_controller --> network_controller;
243253
gator_permissions_controller --> base_controller;
254+
gator_permissions_controller --> messenger;
244255
json_rpc_middleware_stream --> json_rpc_engine;
245256
keyring_controller --> base_controller;
257+
keyring_controller --> messenger;
246258
logging_controller --> base_controller;
247259
logging_controller --> controller_utils;
260+
logging_controller --> messenger;
248261
message_manager --> base_controller;
249262
message_manager --> controller_utils;
263+
message_manager --> messenger;
250264
multichain_account_service --> base_controller;
251265
multichain_account_service --> accounts_controller;
252266
multichain_account_service --> keyring_controller;
@@ -262,11 +276,13 @@ linkStyle default opacity:0.5
262276
multichain_network_controller --> keyring_controller;
263277
multichain_network_controller --> network_controller;
264278
multichain_transactions_controller --> base_controller;
279+
multichain_transactions_controller --> messenger;
265280
multichain_transactions_controller --> polling_controller;
266281
multichain_transactions_controller --> accounts_controller;
267282
multichain_transactions_controller --> keyring_controller;
268283
name_controller --> base_controller;
269284
name_controller --> controller_utils;
285+
name_controller --> messenger;
270286
network_controller --> base_controller;
271287
network_controller --> controller_utils;
272288
network_controller --> eth_block_tracker;
@@ -277,48 +293,59 @@ linkStyle default opacity:0.5
277293
network_controller --> error_reporting_service;
278294
network_enablement_controller --> base_controller;
279295
network_enablement_controller --> controller_utils;
296+
network_enablement_controller --> messenger;
280297
network_enablement_controller --> multichain_network_controller;
281298
network_enablement_controller --> network_controller;
282299
network_enablement_controller --> transaction_controller;
283300
notification_services_controller --> base_controller;
284301
notification_services_controller --> controller_utils;
302+
notification_services_controller --> messenger;
285303
notification_services_controller --> keyring_controller;
286304
notification_services_controller --> profile_sync_controller;
287305
permission_controller --> base_controller;
288306
permission_controller --> controller_utils;
289307
permission_controller --> json_rpc_engine;
308+
permission_controller --> messenger;
290309
permission_controller --> approval_controller;
291310
permission_log_controller --> base_controller;
292311
permission_log_controller --> json_rpc_engine;
293312
phishing_controller --> base_controller;
294313
phishing_controller --> controller_utils;
314+
phishing_controller --> messenger;
295315
phishing_controller --> transaction_controller;
296316
polling_controller --> base_controller;
297317
polling_controller --> controller_utils;
298318
polling_controller --> network_controller;
299319
preferences_controller --> base_controller;
300320
preferences_controller --> controller_utils;
321+
preferences_controller --> messenger;
301322
preferences_controller --> keyring_controller;
302323
profile_sync_controller --> base_controller;
324+
profile_sync_controller --> messenger;
303325
profile_sync_controller --> address_book_controller;
304326
profile_sync_controller --> keyring_controller;
305327
rate_limit_controller --> base_controller;
328+
rate_limit_controller --> messenger;
306329
remote_feature_flag_controller --> base_controller;
307330
remote_feature_flag_controller --> controller_utils;
331+
remote_feature_flag_controller --> messenger;
308332
sample_controllers --> base_controller;
309333
sample_controllers --> controller_utils;
310334
sample_controllers --> network_controller;
311335
seedless_onboarding_controller --> base_controller;
336+
seedless_onboarding_controller --> messenger;
312337
seedless_onboarding_controller --> keyring_controller;
313338
selected_network_controller --> base_controller;
314339
selected_network_controller --> json_rpc_engine;
340+
selected_network_controller --> messenger;
315341
selected_network_controller --> network_controller;
316342
selected_network_controller --> permission_controller;
317343
shield_controller --> base_controller;
318344
shield_controller --> signature_controller;
319345
shield_controller --> transaction_controller;
320346
signature_controller --> base_controller;
321347
signature_controller --> controller_utils;
348+
signature_controller --> messenger;
322349
signature_controller --> accounts_controller;
323350
signature_controller --> approval_controller;
324351
signature_controller --> gator_permissions_controller;
@@ -331,6 +358,7 @@ linkStyle default opacity:0.5
331358
subscription_controller --> polling_controller;
332359
subscription_controller --> profile_sync_controller;
333360
token_search_discovery_controller --> base_controller;
361+
token_search_discovery_controller --> messenger;
334362
transaction_controller --> base_controller;
335363
transaction_controller --> controller_utils;
336364
transaction_controller --> messenger;
@@ -343,6 +371,7 @@ linkStyle default opacity:0.5
343371
transaction_controller --> remote_feature_flag_controller;
344372
user_operation_controller --> base_controller;
345373
user_operation_controller --> controller_utils;
374+
user_operation_controller --> messenger;
346375
user_operation_controller --> polling_controller;
347376
user_operation_controller --> approval_controller;
348377
user_operation_controller --> eth_block_tracker;

‎eslint-warning-thresholds.json‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,6 @@
107107
"packages/composable-controller/src/ComposableController.test.ts": {
108108
"import-x/namespace": 3
109109
},
110-
"packages/composable-controller/src/ComposableController.ts": {
111-
"@typescript-eslint/no-unused-vars": 1
112-
},
113110
"packages/controller-utils/jest.environment.js": {
114111
"n/prefer-global/text-encoder": 1,
115112
"n/prefer-global/text-decoder": 1,
@@ -137,7 +134,7 @@
137134
"@typescript-eslint/no-misused-promises": 1
138135
},
139136
"packages/ens-controller/src/EnsController.test.ts": {
140-
"import-x/order": 2
137+
"import-x/order": 1
141138
},
142139
"packages/ens-controller/src/EnsController.ts": {
143140
"jsdoc/check-tag-names": 6
@@ -378,8 +375,14 @@
378375
"@typescript-eslint/no-unused-vars": 1,
379376
"@typescript-eslint/prefer-promise-reject-errors": 1
380377
},
381-
"packages/permission-controller/src/Permission.ts": {
382-
"prettier/prettier": 11
378+
"packages/network-controller/tests/create-network-client.test.ts": {
379+
"import-x/order": 1
380+
},
381+
"packages/network-controller/tests/provider-api-tests/helpers.ts": {
382+
"@typescript-eslint/prefer-promise-reject-errors": 1,
383+
"import-x/namespace": 1,
384+
"import-x/no-named-as-default-member": 1,
385+
"promise/catch-or-return": 1
383386
},
384387
"packages/permission-controller/src/PermissionController.test.ts": {
385388
"jest/no-conditional-in-test": 4
@@ -408,9 +411,7 @@
408411
"@typescript-eslint/prefer-readonly": 1
409412
},
410413
"packages/rate-limit-controller/src/RateLimitController.ts": {
411-
"jsdoc/check-tag-names": 4,
412-
"jsdoc/require-returns": 1,
413-
"jsdoc/tag-lines": 3
414+
"jsdoc/check-tag-names": 4
414415
},
415416
"packages/remote-feature-flag-controller/src/client-config-api-service/client-config-api-service.test.ts": {
416417
"import-x/order": 1,

‎packages/account-tree-controller/CHANGELOG.md‎

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

88
## [Unreleased]
99

10+
### Changed
11+
12+
- **BREAKING:** Use new `Messenger` from `@metamask/messenger` ([#6380](https://github.com/MetaMask/core/pull/6380))
13+
- Previously, `AccountTreeController` accepted a `RestrictedMessenger` instance from `@metamask/base-controller`.
14+
1015
## [1.6.0]
1116

1217
### Changed

‎packages/account-tree-controller/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
},
4949
"dependencies": {
5050
"@metamask/base-controller": "^8.4.2",
51+
"@metamask/messenger": "^0.3.0",
5152
"@metamask/snaps-sdk": "^9.0.0",
5253
"@metamask/snaps-utils": "^11.0.0",
5354
"@metamask/superstruct": "^3.1.0",

0 commit comments

Comments
 (0)