Merge branch 'main' into mikesposito/refactor/remove-uncached-encryption

Author: mikesposito

.github/CODEOWNERS

@@ -81,6 +81,7 @@
 /packages/seedless-onboarding-controller @MetaMask/web3auth
 /packages/shield-controller              @MetaMask/web3auth
 /packages/subscription-controller        @MetaMask/web3auth
+/packages/claims-controller              @MetaMask/web3auth
 
 ## Joint team ownership
 /packages/announcement-controller               @MetaMask/core-extension-ux @MetaMask/mobile-core-ux
@@ -182,3 +183,5 @@
 /packages/subscription-controller/CHANGELOG.md @MetaMask/web3auth @MetaMask/core-platform
 /packages/core-backend/package.json           @MetaMask/core-platform @MetaMask/metamask-assets
 /packages/core-backend/CHANGELOG.md           @MetaMask/core-platform @MetaMask/metamask-assets
+/packages/claims-controller/package.json @MetaMask/web3auth @MetaMask/core-platform
+/packages/claims-controller/CHANGELOG.md @MetaMask/web3auth @MetaMask/core-platform

.github/workflows/changelog-check.yml

@@ -6,9 +6,9 @@ on:
 
 jobs:
   check_changelog:
-    uses: MetaMask/github-tools/.github/workflows/changelog-check.yml@bfb5e6fb233edeedd5ee9ed3f15ff7fa9171337f
+    uses: MetaMask/github-tools/.github/workflows/changelog-check.yml@fc6fe1a3fb591f6afa61f0dbbe7698bd50fab9c7
     with:
-      action-sha: bfb5e6fb233edeedd5ee9ed3f15ff7fa9171337f
+      action-sha: fc6fe1a3fb591f6afa61f0dbbe7698bd50fab9c7
       base-branch: ${{ github.event.pull_request.base.ref }}
       head-ref: ${{ github.head_ref }}
       labels: ${{ toJSON(github.event.pull_request.labels) }}

README.md

@@ -33,6 +33,7 @@ Each package in this repository has its own README where you can find installati
 - [`@metamask/bridge-status-controller`](packages/bridge-status-controller)
 - [`@metamask/build-utils`](packages/build-utils)
 - [`@metamask/chain-agnostic-permission`](packages/chain-agnostic-permission)
+- [`@metamask/claims-controller`](packages/claims-controller)
 - [`@metamask/composable-controller`](packages/composable-controller)
 - [`@metamask/controller-utils`](packages/controller-utils)
 - [`@metamask/core-backend`](packages/core-backend)
@@ -103,6 +104,7 @@ linkStyle default opacity:0.5
   bridge_status_controller(["@metamask/bridge-status-controller"]);
   build_utils(["@metamask/build-utils"]);
   chain_agnostic_permission(["@metamask/chain-agnostic-permission"]);
+  claims_controller(["@metamask/claims-controller"]);
   composable_controller(["@metamask/composable-controller"]);
   controller_utils(["@metamask/controller-utils"]);
   core_backend(["@metamask/core-backend"]);
@@ -211,6 +213,9 @@ linkStyle default opacity:0.5
   chain_agnostic_permission --> controller_utils;
   chain_agnostic_permission --> network_controller;
   chain_agnostic_permission --> permission_controller;
+  claims_controller --> base_controller;
+  claims_controller --> controller_utils;
+  claims_controller --> messenger;
   composable_controller --> base_controller;
   composable_controller --> messenger;
   composable_controller --> json_rpc_engine;
@@ -381,15 +386,16 @@ linkStyle default opacity:0.5
   transaction_controller --> gas_fee_controller;
   transaction_controller --> network_controller;
   transaction_controller --> remote_feature_flag_controller;
+  transaction_pay_controller --> base_controller;
   transaction_pay_controller --> controller_utils;
   transaction_pay_controller --> messenger;
   transaction_pay_controller --> assets_controllers;
   transaction_pay_controller --> bridge_controller;
   transaction_pay_controller --> bridge_status_controller;
   transaction_pay_controller --> gas_fee_controller;
   transaction_pay_controller --> network_controller;
-  transaction_pay_controller --> transaction_controller;
   transaction_pay_controller --> remote_feature_flag_controller;
+  transaction_pay_controller --> transaction_controller;
   user_operation_controller --> base_controller;
   user_operation_controller --> controller_utils;
   user_operation_controller --> messenger;

eslint-warning-thresholds.json

@@ -2,6 +2,9 @@
   "packages/accounts-controller/src/AccountsController.test.ts": {
     "import-x/namespace": 1
   },
+  "packages/accounts-controller/src/utils.ts": {
+    "@typescript-eslint/no-unsafe-enum-comparison": 8
+  },
   "packages/approval-controller/src/ApprovalController.test.ts": {
     "import-x/order": 1,
     "jest/no-conditional-in-test": 16
@@ -14,13 +17,34 @@
     "n/prefer-global/text-decoder": 1,
     "no-shadow": 2
   },
+  "packages/assets-controllers/src/AccountTrackerController.ts": {
+    "@typescript-eslint/no-misused-promises": 4
+  },
   "packages/assets-controllers/src/CurrencyRateController.test.ts": {
     "jest/no-conditional-in-test": 1
   },
+  "packages/assets-controllers/src/DeFiPositionsController/DeFiPositionsController.ts": {
+    "@typescript-eslint/no-misused-promises": 2
+  },
+  "packages/assets-controllers/src/MultichainAssetsController/MultichainAssetsController.ts": {
+    "@typescript-eslint/no-misused-promises": 3
+  },
+  "packages/assets-controllers/src/MultichainAssetsController/utils.ts": {
+    "@typescript-eslint/no-unsafe-enum-comparison": 1
+  },
+  "packages/assets-controllers/src/MultichainAssetsRatesController/MultichainAssetsRatesController.ts": {
+    "@typescript-eslint/no-misused-promises": 2
+  },
+  "packages/assets-controllers/src/MultichainBalancesController/MultichainBalancesController.ts": {
+    "@typescript-eslint/no-misused-promises": 2
+  },
   "packages/assets-controllers/src/NftController.test.ts": {
     "import-x/namespace": 9,
     "jest/no-conditional-in-test": 6
   },
+  "packages/assets-controllers/src/NftController.ts": {
+    "@typescript-eslint/no-misused-promises": 2
+  },
   "packages/assets-controllers/src/NftDetectionController.test.ts": {
     "import-x/namespace": 6,
     "import-x/order": 3
@@ -50,6 +74,12 @@
   "packages/assets-controllers/src/Standards/NftStandards/ERC721/ERC721Standard.ts": {
     "prettier/prettier": 1
   },
+  "packages/assets-controllers/src/TokenBalancesController.ts": {
+    "@typescript-eslint/no-misused-promises": 1
+  },
+  "packages/assets-controllers/src/TokenDetectionController.ts": {
+    "@typescript-eslint/no-misused-promises": 5
+  },
   "packages/assets-controllers/src/TokenListController.test.ts": {
     "import-x/namespace": 7,
     "import-x/order": 2,
@@ -85,6 +115,9 @@
   "packages/base-controller/src/BaseController.test.ts": {
     "import-x/namespace": 13
   },
+  "packages/bridge-status-controller/src/utils/transaction.ts": {
+    "@typescript-eslint/no-unsafe-enum-comparison": 2
+  },
   "packages/build-utils/src/transforms/remove-fenced-code.test.ts": {
     "import-x/order": 1
   },
@@ -130,7 +163,8 @@
     "@typescript-eslint/naming-convention": 1
   },
   "packages/eth-block-tracker/src/PollingBlockTracker.test.ts": {
-    "@typescript-eslint/naming-convention": 1
+    "@typescript-eslint/naming-convention": 1,
+    "@typescript-eslint/unbound-method": 4
   },
   "packages/eth-block-tracker/src/PollingBlockTracker.ts": {
     "@typescript-eslint/naming-convention": 1,
@@ -158,6 +192,9 @@
     "jsdoc/require-jsdoc": 1,
     "no-restricted-syntax": 1
   },
+  "packages/eth-json-rpc-middleware/src/block-ref-rewrite.test.ts": {
+    "@typescript-eslint/no-misused-promises": 3
+  },
   "packages/eth-json-rpc-middleware/src/block-ref-rewrite.ts": {
     "jsdoc/match-description": 1
   },
@@ -247,6 +284,7 @@
     "n/no-unsupported-features/node-builtins": 1
   },
   "packages/keyring-controller/src/KeyringController.test.ts": {
+    "@typescript-eslint/no-misused-promises": 1,
     "jest/no-conditional-in-test": 1
   },
   "packages/keyring-controller/src/KeyringController.ts": {
@@ -290,6 +328,12 @@
   "packages/message-manager/src/utils.ts": {
     "@typescript-eslint/no-unused-vars": 1
   },
+  "packages/multichain-api-middleware/src/handlers/wallet-invokeMethod.ts": {
+    "@typescript-eslint/no-unsafe-enum-comparison": 1
+  },
+  "packages/multichain-transactions-controller/src/MultichainTransactionsController.ts": {
+    "@typescript-eslint/no-misused-promises": 2
+  },
   "packages/name-controller/src/NameController.ts": {
     "@typescript-eslint/no-unsafe-enum-comparison": 1,
     "@typescript-eslint/prefer-readonly": 2
@@ -321,6 +365,12 @@
   "packages/name-controller/src/util.ts": {
     "jsdoc/require-returns": 1
   },
+  "packages/network-controller/src/NetworkController.ts": {
+    "@typescript-eslint/no-misused-promises": 1
+  },
+  "packages/notification-services-controller/src/NotificationServicesController/NotificationServicesController.ts": {
+    "@typescript-eslint/no-misused-promises": 1
+  },
   "packages/permission-controller/src/PermissionController.test.ts": {
     "jest/no-conditional-in-test": 4
   },
@@ -366,6 +416,12 @@
   "packages/remote-feature-flag-controller/src/utils/user-segmentation-utils.ts": {
     "jsdoc/tag-lines": 2
   },
+  "packages/sample-controllers/src/sample-gas-prices-controller.ts": {
+    "@typescript-eslint/no-misused-promises": 1
+  },
+  "packages/sample-controllers/src/sample-gas-prices-service/sample-gas-prices-service.test.ts": {
+    "@typescript-eslint/no-misused-promises": 4
+  },
   "packages/seedless-onboarding-controller/jest.environment.js": {
     "n/no-unsupported-features/node-builtins": 1
   },
@@ -375,9 +431,15 @@
   "packages/selected-network-controller/tests/SelectedNetworkController.test.ts": {
     "jest/no-conditional-in-test": 1
   },
-  "packages/signature-controller/src/SignatureController.ts": {
+  "packages/shield-controller/src/ShieldController.ts": {
+    "@typescript-eslint/no-unsafe-enum-comparison": 1
+  },
+  "packages/shield-controller/src/backend.ts": {
     "@typescript-eslint/no-unsafe-enum-comparison": 3
   },
+  "packages/signature-controller/src/SignatureController.ts": {
+    "@typescript-eslint/no-unsafe-enum-comparison": 4
+  },
   "packages/signature-controller/src/utils/normalize.ts": {
     "@typescript-eslint/no-unused-vars": 1
   },

eslint.config.mjs

@@ -117,11 +117,6 @@ const config = createConfig([
     languageOptions: {
       parserOptions: {
         tsconfigRootDir: import.meta.dirname,
-        project: './tsconfig.packages.json',
-        // Disable `projectService` because we run into out-of-memory issues.
-        // See this ticket for inspiration out how to solve this:
-        // <https://github.com/typescript-eslint/typescript-eslint/issues/1192>
-        projectService: false,
       },
     },
     rules: {
@@ -133,6 +128,9 @@ const config = createConfig([
         },
       ],
 
+      // TODO: Disable in `eslint-config-typescript`, tracked here: https://github.com/MetaMask/eslint-config/issues/413
+      '@typescript-eslint/no-unnecessary-type-arguments': 'off',
+
       // This rule does not detect multiple imports of the same file where types
       // are being imported in one case and runtime values are being imported in
       // another

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/core-monorepo",
-  "version": "664.0.0",
+  "version": "666.0.0",
   "private": true,
   "description": "Monorepo for packages shared between MetaMask clients",
   "repository": {
@@ -25,7 +25,7 @@
     "lint": "yarn lint:eslint && echo && yarn lint:misc --check && yarn constraints && yarn lint:dependencies && yarn lint:teams && yarn generate-method-action-types --check",
     "lint:dependencies": "depcheck && yarn dedupe --check",
     "lint:dependencies:fix": "depcheck && yarn dedupe",
-    "lint:eslint": "yarn build:only-clean && yarn tsx ./scripts/run-eslint.ts --cache",
+    "lint:eslint": "yarn build:only-clean && yarn tsx ./scripts/run-eslint.ts ",
     "lint:fix": "yarn lint:eslint --fix && echo && yarn lint:misc --write && yarn constraints --fix && yarn lint:dependencies:fix && yarn generate-method-action-types --fix",
     "lint:misc": "prettier --no-error-on-unmatched-pattern '**/*.json' '**/*.md' '**/*.yml' '!.yarnrc.yml' '!merged-packages/**' --ignore-path .gitignore",
     "lint:teams": "tsx scripts/lint-teams-json.ts",
@@ -63,6 +63,7 @@
     "@metamask/eth-block-tracker": "^14.0.0",
     "@metamask/eth-json-rpc-provider": "^5.0.1",
     "@metamask/json-rpc-engine": "^10.1.1",
+    "@metamask/network-controller": "^25.0.0",
     "@metamask/utils": "^11.8.1",
     "@ts-bridge/cli": "^0.6.4",
     "@types/jest": "^27.4.1",
@@ -71,9 +72,6 @@
     "@types/semver": "^7",
     "@typescript-eslint/eslint-plugin": "^8.7.0",
     "@typescript-eslint/parser": "^8.7.0",
-    "@yarnpkg/cli": "^4.5.3",
-    "@yarnpkg/core": "^4.1.6",
-    "@yarnpkg/fslib": "^3.1.1",
     "@yarnpkg/types": "^4.0.0",
     "babel-jest": "^29.7.0",
     "chalk": "^4.1.2",
@@ -100,7 +98,7 @@
     "semver": "^7.6.3",
     "simple-git-hooks": "^2.8.0",
     "tsx": "^4.20.5",
-    "typescript": "~5.2.2",
+    "typescript": "~5.3.3",
     "typescript-eslint": "^8.7.0",
     "yargs": "^17.7.2"
   },

packages/account-tree-controller/package.json

@@ -74,7 +74,7 @@
     "ts-jest": "^27.1.4",
     "typedoc": "^0.24.8",
     "typedoc-plugin-missing-exports": "^2.0.0",
-    "typescript": "~5.2.2",
+    "typescript": "~5.3.3",
     "webextension-polyfill": "^0.12.0"
   },
   "peerDependencies": {

packages/accounts-controller/package.json

@@ -79,7 +79,7 @@
     "ts-jest": "^27.1.4",
     "typedoc": "^0.24.8",
     "typedoc-plugin-missing-exports": "^2.0.0",
-    "typescript": "~5.2.2",
+    "typescript": "~5.3.3",
     "webextension-polyfill": "^0.12.0"
   },
   "peerDependencies": {

packages/address-book-controller/package.json

@@ -62,7 +62,7 @@
     "ts-jest": "^27.1.4",
     "typedoc": "^0.24.8",
     "typedoc-plugin-missing-exports": "^2.0.0",
-    "typescript": "~5.2.2"
+    "typescript": "~5.3.3"
   },
   "engines": {
     "node": "^18.18 || >=20"

packages/analytics-controller/package.json

@@ -62,7 +62,7 @@
     "ts-jest": "^27.1.4",
     "typedoc": "^0.24.8",
     "typedoc-plugin-missing-exports": "^2.0.0",
-    "typescript": "~5.2.2"
+    "typescript": "~5.3.3"
   },
   "engines": {
     "node": "^18.18 || >=20"