chore: resolved conflicts and rebased with main

Author: lwin-kyaw

.github/CODEOWNERS

@@ -3,9 +3,11 @@ name: Check Changelog
 on:
   pull_request:
     types: [opened, synchronize, labeled, unlabeled]
+  merge_group:
 
 jobs:
   check_changelog:
+    if: github.event_name != 'merge_group'
     uses: MetaMask/github-tools/.github/workflows/changelog-check.yml@fc6fe1a3fb591f6afa61f0dbbe7698bd50fab9c7
     with:
       action-sha: fc6fe1a3fb591f6afa61f0dbbe7698bd50fab9c7

.github/workflows/changelog-check.yml

@@ -6,9 +6,11 @@ on:
       - synchronize
       - labeled
       - unlabeled
+  merge_group:
 
 jobs:
   ensure-blocking-pr-labels-absent:
+    if: github.event_name != 'merge_group'
     runs-on: ubuntu-latest
     permissions:
       pull-requests: read

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

@@ -4,6 +4,7 @@ on:
   push:
     branches: [main]
   pull_request:
+  merge_group:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -23,17 +24,17 @@ jobs:
         run: ${{ steps.download-actionlint.outputs.executable }} -color
         shell: bash
 
-  analyse-code:
-    name: Code scanner
-    needs: check-workflows
-    uses: ./.github/workflows/security-code-scanner.yml
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-    secrets:
-      SECURITY_SCAN_METRICS_TOKEN: ${{ secrets.SECURITY_SCAN_METRICS_TOKEN }}
-      APPSEC_BOT_SLACK_WEBHOOK: ${{ secrets.APPSEC_BOT_SLACK_WEBHOOK }}
+  # analyse-code:
+  #  name: Code scanner
+  #  needs: check-workflows
+  #  uses: ./.github/workflows/security-code-scanner.yml
+  #  permissions:
+  #    actions: read
+  #    contents: read
+  #    security-events: write
+  #  secrets:
+  #    SECURITY_SCAN_METRICS_TOKEN: ${{ secrets.SECURITY_SCAN_METRICS_TOKEN }}
+  #    APPSEC_BOT_SLACK_WEBHOOK: ${{ secrets.APPSEC_BOT_SLACK_WEBHOOK }}
 
   lint-build-test:
     name: Lint, build, and test
@@ -76,7 +77,7 @@ jobs:
     name: All jobs complete
     runs-on: ubuntu-latest
     needs:
-      - analyse-code
+      # - analyse-code
       - lint-build-test
     outputs:
       passed: ${{ steps.set-output.outputs.passed }}

.github/workflows/main.yml

@@ -1 +1 @@
-lts/*
+v24.7.0

.nvmrc

@@ -148,21 +148,28 @@ linkStyle default opacity:0.5
   transaction_controller(["@metamask/transaction-controller"]);
   user_operation_controller(["@metamask/user-operation-controller"]);
   account_tree_controller --> base_controller;
+  account_tree_controller --> messenger;
   account_tree_controller --> accounts_controller;
   account_tree_controller --> keyring_controller;
   account_tree_controller --> multichain_account_service;
   account_tree_controller --> profile_sync_controller;
   accounts_controller --> base_controller;
+  accounts_controller --> messenger;
   accounts_controller --> controller_utils;
   accounts_controller --> keyring_controller;
   accounts_controller --> network_controller;
   address_book_controller --> base_controller;
   address_book_controller --> controller_utils;
+  address_book_controller --> messenger;
   announcement_controller --> base_controller;
+  announcement_controller --> messenger;
   app_metadata_controller --> base_controller;
+  app_metadata_controller --> messenger;
   approval_controller --> base_controller;
+  approval_controller --> messenger;
   assets_controllers --> base_controller;
   assets_controllers --> controller_utils;
+  assets_controllers --> messenger;
   assets_controllers --> polling_controller;
   assets_controllers --> account_tree_controller;
   assets_controllers --> accounts_controller;
@@ -180,6 +187,7 @@ linkStyle default opacity:0.5
   bridge_controller --> base_controller;
   bridge_controller --> controller_utils;
   bridge_controller --> gas_fee_controller;
+  bridge_controller --> messenger;
   bridge_controller --> multichain_network_controller;
   bridge_controller --> polling_controller;
   bridge_controller --> accounts_controller;
@@ -200,30 +208,36 @@ linkStyle default opacity:0.5
   chain_agnostic_permission --> network_controller;
   chain_agnostic_permission --> permission_controller;
   composable_controller --> base_controller;
+  composable_controller --> messenger;
   composable_controller --> json_rpc_engine;
-  core_backend --> base_controller;
   core_backend --> controller_utils;
+  core_backend --> messenger;
   core_backend --> profile_sync_controller;
   core_backend --> accounts_controller;
   core_backend --> keyring_controller;
   delegation_controller --> base_controller;
+  delegation_controller --> messenger;
   delegation_controller --> accounts_controller;
   delegation_controller --> keyring_controller;
   earn_controller --> base_controller;
   earn_controller --> controller_utils;
+  earn_controller --> messenger;
   earn_controller --> account_tree_controller;
   earn_controller --> network_controller;
   earn_controller --> transaction_controller;
   eip_5792_middleware --> transaction_controller;
   eip_5792_middleware --> keyring_controller;
+  eip_7702_internal_rpc_middleware --> controller_utils;
   eip1193_permission_middleware --> chain_agnostic_permission;
   eip1193_permission_middleware --> controller_utils;
   eip1193_permission_middleware --> json_rpc_engine;
   eip1193_permission_middleware --> permission_controller;
   ens_controller --> base_controller;
   ens_controller --> controller_utils;
+  ens_controller --> messenger;
   ens_controller --> network_controller;
   error_reporting_service --> base_controller;
+  error_reporting_service --> messenger;
   eth_block_tracker --> eth_json_rpc_provider;
   eth_block_tracker --> json_rpc_engine;
   eth_json_rpc_middleware --> eth_block_tracker;
@@ -237,13 +251,18 @@ linkStyle default opacity:0.5
   gas_fee_controller --> polling_controller;
   gas_fee_controller --> network_controller;
   gator_permissions_controller --> base_controller;
+  gator_permissions_controller --> messenger;
   json_rpc_middleware_stream --> json_rpc_engine;
   keyring_controller --> base_controller;
+  keyring_controller --> messenger;
   logging_controller --> base_controller;
   logging_controller --> controller_utils;
+  logging_controller --> messenger;
   message_manager --> base_controller;
   message_manager --> controller_utils;
+  message_manager --> messenger;
   multichain_account_service --> base_controller;
+  multichain_account_service --> messenger;
   multichain_account_service --> accounts_controller;
   multichain_account_service --> keyring_controller;
   multichain_api_middleware --> chain_agnostic_permission;
@@ -254,66 +273,84 @@ linkStyle default opacity:0.5
   multichain_api_middleware --> multichain_transactions_controller;
   multichain_network_controller --> base_controller;
   multichain_network_controller --> controller_utils;
+  multichain_network_controller --> messenger;
   multichain_network_controller --> accounts_controller;
   multichain_network_controller --> keyring_controller;
   multichain_network_controller --> network_controller;
   multichain_transactions_controller --> base_controller;
+  multichain_transactions_controller --> messenger;
   multichain_transactions_controller --> polling_controller;
   multichain_transactions_controller --> accounts_controller;
   multichain_transactions_controller --> keyring_controller;
   name_controller --> base_controller;
   name_controller --> controller_utils;
+  name_controller --> messenger;
   network_controller --> base_controller;
   network_controller --> controller_utils;
   network_controller --> eth_block_tracker;
   network_controller --> eth_json_rpc_middleware;
   network_controller --> eth_json_rpc_provider;
   network_controller --> json_rpc_engine;
+  network_controller --> messenger;
   network_controller --> error_reporting_service;
   network_enablement_controller --> base_controller;
   network_enablement_controller --> controller_utils;
+  network_enablement_controller --> messenger;
   network_enablement_controller --> multichain_network_controller;
   network_enablement_controller --> network_controller;
   network_enablement_controller --> transaction_controller;
   notification_services_controller --> base_controller;
   notification_services_controller --> controller_utils;
+  notification_services_controller --> messenger;
   notification_services_controller --> keyring_controller;
   notification_services_controller --> profile_sync_controller;
   permission_controller --> base_controller;
   permission_controller --> controller_utils;
   permission_controller --> json_rpc_engine;
+  permission_controller --> messenger;
   permission_controller --> approval_controller;
   permission_log_controller --> base_controller;
   permission_log_controller --> json_rpc_engine;
+  permission_log_controller --> messenger;
   phishing_controller --> base_controller;
   phishing_controller --> controller_utils;
+  phishing_controller --> messenger;
   phishing_controller --> transaction_controller;
   polling_controller --> base_controller;
   polling_controller --> controller_utils;
   polling_controller --> network_controller;
   preferences_controller --> base_controller;
   preferences_controller --> controller_utils;
+  preferences_controller --> messenger;
   preferences_controller --> keyring_controller;
   profile_sync_controller --> base_controller;
+  profile_sync_controller --> messenger;
   profile_sync_controller --> address_book_controller;
   profile_sync_controller --> keyring_controller;
   rate_limit_controller --> base_controller;
+  rate_limit_controller --> messenger;
   remote_feature_flag_controller --> base_controller;
   remote_feature_flag_controller --> controller_utils;
+  remote_feature_flag_controller --> messenger;
   sample_controllers --> base_controller;
+  sample_controllers --> messenger;
   sample_controllers --> controller_utils;
   sample_controllers --> network_controller;
   seedless_onboarding_controller --> base_controller;
+  seedless_onboarding_controller --> messenger;
   seedless_onboarding_controller --> keyring_controller;
   selected_network_controller --> base_controller;
   selected_network_controller --> json_rpc_engine;
+  selected_network_controller --> messenger;
   selected_network_controller --> network_controller;
   selected_network_controller --> permission_controller;
   shield_controller --> base_controller;
+  shield_controller --> messenger;
   shield_controller --> signature_controller;
   shield_controller --> transaction_controller;
   signature_controller --> base_controller;
   signature_controller --> controller_utils;
+  signature_controller --> messenger;
   signature_controller --> accounts_controller;
   signature_controller --> approval_controller;
   signature_controller --> gator_permissions_controller;
@@ -322,11 +359,14 @@ linkStyle default opacity:0.5
   signature_controller --> network_controller;
   subscription_controller --> base_controller;
   subscription_controller --> controller_utils;
+  subscription_controller --> messenger;
   subscription_controller --> polling_controller;
   subscription_controller --> profile_sync_controller;
   token_search_discovery_controller --> base_controller;
+  token_search_discovery_controller --> messenger;
   transaction_controller --> base_controller;
   transaction_controller --> controller_utils;
+  transaction_controller --> messenger;
   transaction_controller --> accounts_controller;
   transaction_controller --> approval_controller;
   transaction_controller --> eth_block_tracker;
@@ -336,6 +376,7 @@ linkStyle default opacity:0.5
   transaction_controller --> remote_feature_flag_controller;
   user_operation_controller --> base_controller;
   user_operation_controller --> controller_utils;
+  user_operation_controller --> messenger;
   user_operation_controller --> polling_controller;
   user_operation_controller --> approval_controller;
   user_operation_controller --> eth_block_tracker;