Skip to content

Commit 4076d85

Browse files
committed
Merge branch 'main' into defi-controller-changes
2 parents a3456b1 + a607066 commit 4076d85

File tree

222 files changed

+3900
-2731
lines changed

Some content is hidden

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

222 files changed

+3900
-2731
lines changed

.github/workflows/main.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ jobs:
2424
run: ${{ steps.download-actionlint.outputs.executable }} -color
2525
shell: bash
2626

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 }}
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 }}
3838

3939
lint-build-test:
4040
name: Lint, build, and test
@@ -77,7 +77,7 @@ jobs:
7777
name: All jobs complete
7878
runs-on: ubuntu-latest
7979
needs:
80-
- analyse-code
80+
# - analyse-code
8181
- lint-build-test
8282
outputs:
8383
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: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ linkStyle default opacity:0.5
187187
bridge_controller --> base_controller;
188188
bridge_controller --> controller_utils;
189189
bridge_controller --> gas_fee_controller;
190+
bridge_controller --> messenger;
190191
bridge_controller --> multichain_network_controller;
191192
bridge_controller --> polling_controller;
192193
bridge_controller --> accounts_controller;
@@ -209,8 +210,8 @@ linkStyle default opacity:0.5
209210
composable_controller --> base_controller;
210211
composable_controller --> messenger;
211212
composable_controller --> json_rpc_engine;
212-
core_backend --> base_controller;
213213
core_backend --> controller_utils;
214+
core_backend --> messenger;
214215
core_backend --> profile_sync_controller;
215216
core_backend --> accounts_controller;
216217
core_backend --> keyring_controller;
@@ -261,6 +262,7 @@ linkStyle default opacity:0.5
261262
message_manager --> controller_utils;
262263
message_manager --> messenger;
263264
multichain_account_service --> base_controller;
265+
multichain_account_service --> messenger;
264266
multichain_account_service --> accounts_controller;
265267
multichain_account_service --> keyring_controller;
266268
multichain_api_middleware --> chain_agnostic_permission;
@@ -271,15 +273,18 @@ linkStyle default opacity:0.5
271273
multichain_api_middleware --> multichain_transactions_controller;
272274
multichain_network_controller --> base_controller;
273275
multichain_network_controller --> controller_utils;
276+
multichain_network_controller --> messenger;
274277
multichain_network_controller --> accounts_controller;
275278
multichain_network_controller --> keyring_controller;
276279
multichain_network_controller --> network_controller;
277280
multichain_transactions_controller --> base_controller;
281+
multichain_transactions_controller --> messenger;
278282
multichain_transactions_controller --> polling_controller;
279283
multichain_transactions_controller --> accounts_controller;
280284
multichain_transactions_controller --> keyring_controller;
281285
name_controller --> base_controller;
282286
name_controller --> controller_utils;
287+
name_controller --> messenger;
283288
network_controller --> base_controller;
284289
network_controller --> controller_utils;
285290
network_controller --> eth_block_tracker;
@@ -290,48 +295,62 @@ linkStyle default opacity:0.5
290295
network_controller --> error_reporting_service;
291296
network_enablement_controller --> base_controller;
292297
network_enablement_controller --> controller_utils;
298+
network_enablement_controller --> messenger;
293299
network_enablement_controller --> multichain_network_controller;
294300
network_enablement_controller --> network_controller;
295301
network_enablement_controller --> transaction_controller;
296302
notification_services_controller --> base_controller;
297303
notification_services_controller --> controller_utils;
304+
notification_services_controller --> messenger;
298305
notification_services_controller --> keyring_controller;
299306
notification_services_controller --> profile_sync_controller;
300307
permission_controller --> base_controller;
301308
permission_controller --> controller_utils;
302309
permission_controller --> json_rpc_engine;
310+
permission_controller --> messenger;
303311
permission_controller --> approval_controller;
304312
permission_log_controller --> base_controller;
305313
permission_log_controller --> json_rpc_engine;
314+
permission_log_controller --> messenger;
306315
phishing_controller --> base_controller;
307316
phishing_controller --> controller_utils;
317+
phishing_controller --> messenger;
308318
phishing_controller --> transaction_controller;
309319
polling_controller --> base_controller;
310320
polling_controller --> controller_utils;
311321
polling_controller --> network_controller;
312322
preferences_controller --> base_controller;
313323
preferences_controller --> controller_utils;
324+
preferences_controller --> messenger;
314325
preferences_controller --> keyring_controller;
315326
profile_sync_controller --> base_controller;
327+
profile_sync_controller --> messenger;
316328
profile_sync_controller --> address_book_controller;
317329
profile_sync_controller --> keyring_controller;
318330
rate_limit_controller --> base_controller;
331+
rate_limit_controller --> messenger;
319332
remote_feature_flag_controller --> base_controller;
320333
remote_feature_flag_controller --> controller_utils;
334+
remote_feature_flag_controller --> messenger;
321335
sample_controllers --> base_controller;
336+
sample_controllers --> messenger;
322337
sample_controllers --> controller_utils;
323338
sample_controllers --> network_controller;
324339
seedless_onboarding_controller --> base_controller;
340+
seedless_onboarding_controller --> messenger;
325341
seedless_onboarding_controller --> keyring_controller;
326342
selected_network_controller --> base_controller;
327343
selected_network_controller --> json_rpc_engine;
344+
selected_network_controller --> messenger;
328345
selected_network_controller --> network_controller;
329346
selected_network_controller --> permission_controller;
330347
shield_controller --> base_controller;
348+
shield_controller --> messenger;
331349
shield_controller --> signature_controller;
332350
shield_controller --> transaction_controller;
333351
signature_controller --> base_controller;
334352
signature_controller --> controller_utils;
353+
signature_controller --> messenger;
335354
signature_controller --> accounts_controller;
336355
signature_controller --> approval_controller;
337356
signature_controller --> gator_permissions_controller;
@@ -340,9 +359,11 @@ linkStyle default opacity:0.5
340359
signature_controller --> network_controller;
341360
subscription_controller --> base_controller;
342361
subscription_controller --> controller_utils;
362+
subscription_controller --> messenger;
343363
subscription_controller --> polling_controller;
344364
subscription_controller --> profile_sync_controller;
345365
token_search_discovery_controller --> base_controller;
366+
token_search_discovery_controller --> messenger;
346367
transaction_controller --> base_controller;
347368
transaction_controller --> controller_utils;
348369
transaction_controller --> messenger;
@@ -355,6 +376,7 @@ linkStyle default opacity:0.5
355376
transaction_controller --> remote_feature_flag_controller;
356377
user_operation_controller --> base_controller;
357378
user_operation_controller --> controller_utils;
379+
user_operation_controller --> messenger;
358380
user_operation_controller --> polling_controller;
359381
user_operation_controller --> approval_controller;
360382
user_operation_controller --> eth_block_tracker;

0 commit comments

Comments
 (0)