[pull] main from MetaMask:main

.github/CODEOWNERS

@@ -36,6 +36,9 @@
 /packages/transaction-pay-controller        @MetaMask/confirmations
 /packages/user-operation-controller         @MetaMask/confirmations
 
+## Transactions Team
+/packages/smart-transactions-controller     @MetaMask/transactions
+
 ## Delegation Team
 /packages/delegation-controller             @MetaMask/delegation
 /packages/gator-permissions-controller      @MetaMask/delegation
@@ -213,6 +216,8 @@
 /packages/selected-network-controller/CHANGELOG.md @MetaMask/wallet-integrations @MetaMask/core-platform
 /packages/signature-controller/package.json       @MetaMask/confirmations @MetaMask/core-platform
 /packages/signature-controller/CHANGELOG.md       @MetaMask/confirmations @MetaMask/core-platform
+/packages/smart-transactions-controller/package.json @MetaMask/transactions @MetaMask/core-platform
+/packages/smart-transactions-controller/CHANGELOG.md @MetaMask/transactions @MetaMask/core-platform
 /packages/transaction-controller/package.json     @MetaMask/confirmations @MetaMask/core-platform
 /packages/transaction-controller/CHANGELOG.md     @MetaMask/confirmations @MetaMask/core-platform
 /packages/transaction-pay-controller/package.json @MetaMask/confirmations @MetaMask/core-platform

.github/workflows/lint-build-test.yml

@@ -135,20 +135,66 @@ jobs:
             exit 1
           fi
 
-  test:
-    name: Test
+  # The following `test-*` jobs are duplicated because a single job may only
+  # create a maximum of 256 matrix combinations, and we have more than 256 total
+  # test combinations across all Node.js versions.
+  test-18:
+    name: Test (18.x)
     runs-on: ubuntu-latest
     needs: prepare
     strategy:
       matrix:
-        node-version: [18.x, 20.x, 22.x]
         package-name: ${{ fromJson(needs.prepare.outputs.child-workspace-package-names) }}
     steps:
       - name: Checkout and setup environment
         uses: MetaMask/action-checkout-and-setup@v2
         with:
           is-high-risk-environment: false
-          node-version: ${{ matrix.node-version }}
+          node-version: 18.x
+      - run: yarn workspace ${{ matrix.package-name }} run test
+      - name: Require clean working directory
+        shell: bash
+        run: |
+          if ! git diff --exit-code; then
+            echo "Working tree dirty at end of job"
+            exit 1
+          fi
+
+  test-20:
+    name: Test (20.x)
+    runs-on: ubuntu-latest
+    needs: prepare
+    strategy:
+      matrix:
+        package-name: ${{ fromJson(needs.prepare.outputs.child-workspace-package-names) }}
+    steps:
+      - name: Checkout and setup environment
+        uses: MetaMask/action-checkout-and-setup@v2
+        with:
+          is-high-risk-environment: false
+          node-version: 20.x
+      - run: yarn workspace ${{ matrix.package-name }} run test
+      - name: Require clean working directory
+        shell: bash
+        run: |
+          if ! git diff --exit-code; then
+            echo "Working tree dirty at end of job"
+            exit 1
+          fi
+
+  test-22:
+    name: Test (22.x)
+    runs-on: ubuntu-latest
+    needs: prepare
+    strategy:
+      matrix:
+        package-name: ${{ fromJson(needs.prepare.outputs.child-workspace-package-names) }}
+    steps:
+      - name: Checkout and setup environment
+        uses: MetaMask/action-checkout-and-setup@v2
+        with:
+          is-high-risk-environment: false
+          node-version: 22.x
       - run: yarn workspace ${{ matrix.package-name }} run test
       - name: Require clean working directory
         shell: bash

README.md

@@ -116,6 +116,7 @@ yarn skills --reset                 # clear saved local selection
 - [`@metamask/selected-network-controller`](packages/selected-network-controller)
 - [`@metamask/shield-controller`](packages/shield-controller)
 - [`@metamask/signature-controller`](packages/signature-controller)
+- [`@metamask/smart-transactions-controller`](packages/smart-transactions-controller)
 - [`@metamask/snap-account-service`](packages/snap-account-service)
 - [`@metamask/social-controllers`](packages/social-controllers)
 - [`@metamask/storage-service`](packages/storage-service)
@@ -210,6 +211,7 @@ linkStyle default opacity:0.5
   selected_network_controller(["@metamask/selected-network-controller"]);
   shield_controller(["@metamask/shield-controller"]);
   signature_controller(["@metamask/signature-controller"]);
+  smart_transactions_controller(["@metamask/smart-transactions-controller"]);
   snap_account_service(["@metamask/snap-account-service"]);
   social_controllers(["@metamask/social-controllers"]);
   storage_service(["@metamask/storage-service"]);
@@ -537,6 +539,16 @@ linkStyle default opacity:0.5
   signature_controller --> logging_controller;
   signature_controller --> messenger;
   signature_controller --> network_controller;
+  smart_transactions_controller --> base_controller;
+  smart_transactions_controller --> controller_utils;
+  smart_transactions_controller --> eth_json_rpc_provider;
+  smart_transactions_controller --> messenger;
+  smart_transactions_controller --> network_controller;
+  smart_transactions_controller --> polling_controller;
+  smart_transactions_controller --> profile_sync_controller;
+  smart_transactions_controller --> remote_feature_flag_controller;
+  smart_transactions_controller --> transaction_controller;
+  smart_transactions_controller --> json_rpc_engine;
   snap_account_service --> account_tree_controller;
   snap_account_service --> keyring_controller;
   snap_account_service --> messenger;
@@ -596,6 +608,8 @@ linkStyle default opacity:0.5
   wallet --> messenger;
   wallet --> remote_feature_flag_controller;
   wallet --> storage_service;
+  wallet_cli --> base_controller;
+  wallet_cli --> wallet;
 ```
 
 <!-- end dependency graph -->

eslint-suppressions.json

@@ -2136,6 +2136,82 @@
       "count": 2
     }
   },
+  "packages/smart-transactions-controller/src/SmartTransactionsController.test.ts": {
+    "@typescript-eslint/explicit-function-return-type": {
+      "count": 12
+    },
+    "@typescript-eslint/no-explicit-any": {
+      "count": 3
+    },
+    "no-restricted-syntax": {
+      "count": 12
+    }
+  },
+  "packages/smart-transactions-controller/src/SmartTransactionsController.ts": {
+    "@typescript-eslint/explicit-function-return-type": {
+      "count": 10
+    },
+    "@typescript-eslint/no-base-to-string": {
+      "count": 1
+    },
+    "@typescript-eslint/no-floating-promises": {
+      "count": 4
+    },
+    "@typescript-eslint/restrict-template-expressions": {
+      "count": 1
+    },
+    "no-restricted-syntax": {
+      "count": 4
+    }
+  },
+  "packages/smart-transactions-controller/src/featureFlags/feature-flags.ts": {
+    "@typescript-eslint/naming-convention": {
+      "count": 1
+    }
+  },
+  "packages/smart-transactions-controller/src/selectors.ts": {
+    "@typescript-eslint/explicit-function-return-type": {
+      "count": 2
+    }
+  },
+  "packages/smart-transactions-controller/src/types.ts": {
+    "@typescript-eslint/naming-convention": {
+      "count": 25
+    },
+    "@typescript-eslint/no-explicit-any": {
+      "count": 7
+    },
+    "@typescript-eslint/prefer-enum-initializers": {
+      "count": 6
+    }
+  },
+  "packages/smart-transactions-controller/src/utils.test.ts": {
+    "@typescript-eslint/explicit-function-return-type": {
+      "count": 7
+    }
+  },
+  "packages/smart-transactions-controller/src/utils.ts": {
+    "@typescript-eslint/explicit-function-return-type": {
+      "count": 10
+    },
+    "@typescript-eslint/naming-convention": {
+      "count": 1
+    },
+    "@typescript-eslint/no-explicit-any": {
+      "count": 4
+    },
+    "@typescript-eslint/prefer-nullish-coalescing": {
+      "count": 1
+    },
+    "jsdoc/require-param-description": {
+      "count": 1
+    }
+  },
+  "packages/smart-transactions-controller/tests/helpers.ts": {
+    "@typescript-eslint/explicit-function-return-type": {
+      "count": 2
+    }
+  },
   "packages/snap-account-service/src/SnapAccountService.test.ts": {
     "no-restricted-syntax": {
       "count": 2

eslint.config.mjs

@@ -77,6 +77,7 @@ const config = createConfig([
       '**/coverage/**',
       '**/dist/**',
       '**/docs/**',
+      '.skills-cache/**',
       '.yarn/**',
       'merged-packages/**',
       'scripts/create-package/package-template/**',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/core-monorepo",
-  "version": "1044.0.0",
+  "version": "1046.0.0",
   "private": true,
   "description": "Monorepo for packages shared between MetaMask clients",
   "repository": {

packages/bridge-controller/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add optional `environment_type` property to the `ButtonClicked` unified swap/bridge event context ([#9121](https://github.com/MetaMask/core/pull/9121))
+
 ### Changed
 
 - Bump `@metamask/assets-controllers` from `^109.0.0` to `^109.1.0` ([#9110](https://github.com/MetaMask/core/pull/9110))