Merge branch 'main' into add-rpc-service-chain

.github/CODEOWNERS

@@ -26,6 +26,8 @@
 /packages/transaction-controller            @MetaMask/confirmations
 /packages/user-operation-controller         @MetaMask/confirmations
 
+## Earn Team
+/packages/earn-controller                   @MetaMask/earn
 ## Notifications Team
 /packages/notification-services-controller     @MetaMask/notifications
 
@@ -74,6 +76,8 @@
 /packages/approval-controller/CHANGELOG.md        @MetaMask/confirmations @MetaMask/wallet-framework-engineers
 /packages/assets-controllers/package.json         @MetaMask/metamask-assets @MetaMask/wallet-framework-engineers
 /packages/assets-controllers/CHANGELOG.md         @MetaMask/metamask-assets @MetaMask/wallet-framework-engineers
+/packages/earn-controller/package.json            @MetaMask/earn @MetaMask/wallet-framework-engineers
+/packages/earn-controller/CHANGELOG.md            @MetaMask/earn @MetaMask/wallet-framework-engineers
 /packages/ens-controller/package.json             @MetaMask/confirmations @MetaMask/wallet-framework-engineers
 /packages/ens-controller/CHANGELOG.md             @MetaMask/confirmations @MetaMask/wallet-framework-engineers
 /packages/gas-fee-controller/package.json         @MetaMask/confirmations @MetaMask/wallet-framework-engineers
@@ -108,3 +112,4 @@
 /packages/multichain-transactions-controller/CHANGELOG.md @MetaMask/accounts-engineers @MetaMask/wallet-framework-engineers
 /packages/token-search-discovery-controller/package.json      @MetaMask/portfolio @MetaMask/wallet-framework-engineers
 /packages/token-search-discovery-controller/CHANGELOG.md      @MetaMask/portfolio @MetaMask/wallet-framework-engineers
+

README.md

@@ -29,6 +29,7 @@ Each package in this repository has its own README where you can find installati
 - [`@metamask/build-utils`](packages/build-utils)
 - [`@metamask/composable-controller`](packages/composable-controller)
 - [`@metamask/controller-utils`](packages/controller-utils)
+- [`@metamask/earn-controller`](packages/earn-controller)
 - [`@metamask/ens-controller`](packages/ens-controller)
 - [`@metamask/eth-json-rpc-provider`](packages/eth-json-rpc-provider)
 - [`@metamask/gas-fee-controller`](packages/gas-fee-controller)
@@ -74,6 +75,7 @@ linkStyle default opacity:0.5
   build_utils(["@metamask/build-utils"]);
   composable_controller(["@metamask/composable-controller"]);
   controller_utils(["@metamask/controller-utils"]);
+  earn_controller(["@metamask/earn-controller"]);
   ens_controller(["@metamask/ens-controller"]);
   eth_json_rpc_provider(["@metamask/eth-json-rpc-provider"]);
   gas_fee_controller(["@metamask/gas-fee-controller"]);

eslint-warning-thresholds.json

@@ -2,24 +2,24 @@
   "@typescript-eslint/consistent-type-exports": 19,
   "@typescript-eslint/no-base-to-string": 3,
   "@typescript-eslint/no-duplicate-enum-values": 2,
-  "@typescript-eslint/no-unsafe-enum-comparison": 34,
+  "@typescript-eslint/no-unsafe-enum-comparison": 32,
   "@typescript-eslint/no-unused-vars": 41,
   "@typescript-eslint/prefer-promise-reject-errors": 33,
-  "@typescript-eslint/prefer-readonly": 142,
+  "@typescript-eslint/prefer-readonly": 138,
   "import-x/namespace": 189,
   "import-x/no-named-as-default": 1,
   "import-x/no-named-as-default-member": 8,
-  "import-x/order": 211,
+  "import-x/order": 206,
   "jest/no-conditional-in-test": 113,
   "jest/prefer-lowercase-title": 2,
   "jest/prefer-strict-equal": 2,
-  "jsdoc/check-tag-names": 375,
-  "jsdoc/require-returns": 25,
-  "jsdoc/tag-lines": 334,
+  "jsdoc/check-tag-names": 365,
+  "jsdoc/require-returns": 24,
+  "jsdoc/tag-lines": 327,
   "n/no-unsupported-features/node-builtins": 4,
   "n/prefer-global/text-encoder": 4,
   "n/prefer-global/text-decoder": 4,
-  "prettier/prettier": 114,
+  "prettier/prettier": 80,
   "promise/always-return": 3,
   "promise/catch-or-return": 2,
   "promise/param-names": 8,

packages/address-book-controller/src/AddressBookController.test.ts

@@ -1,4 +1,4 @@
-import { ControllerMessenger } from '@metamask/base-controller';
+import { Messenger } from '@metamask/base-controller';
 import { toHex } from '@metamask/controller-utils';
 
 import type {
@@ -17,11 +17,11 @@ import {
  * @returns A restricted controller messenger.
  */
 function getRestrictedMessenger() {
-  const controllerMessenger = new ControllerMessenger<
+  const messenger = new Messenger<
     AddressBookControllerActions,
     AddressBookControllerEvents
   >();
-  return controllerMessenger.getRestricted({
+  return messenger.getRestricted({
     name: controllerName,
     allowedActions: [],
     allowedEvents: [],

packages/address-book-controller/src/AddressBookController.ts

@@ -1,7 +1,7 @@
 import type {
   ControllerGetStateAction,
   ControllerStateChangeEvent,
-  RestrictedControllerMessenger,
+  RestrictedMessenger,
 } from '@metamask/base-controller';
 import { BaseController } from '@metamask/base-controller';
 import {
@@ -122,7 +122,7 @@ export const getDefaultAddressBookControllerState =
 /**
  * The messenger of the {@link AddressBookController} for communication.
  */
-export type AddressBookControllerMessenger = RestrictedControllerMessenger<
+export type AddressBookControllerMessenger = RestrictedMessenger<
   typeof controllerName,
   AddressBookControllerActions,
   AddressBookControllerEvents,

packages/assets-controllers/src/TokensController.test.ts

@@ -1457,7 +1457,9 @@ describe('TokensController', () => {
             }),
           },
         },
-        async ({ controller }) => {
+        async ({ controller, changeNetwork }) => {
+          changeNetwork({ selectedNetworkClientId: InfuraNetworkType.goerli });
+
           const dummyTokens: Token[] = [
             {
               address: '0x01',

packages/assets-controllers/src/TokensController.ts

@@ -496,7 +496,7 @@ export class TokensController extends BaseController<
     const { allTokens, ignoredTokens, allDetectedTokens } = this.state;
     const importedTokensMap: { [key: string]: true } = {};
 
-    let interactingChainId;
+    let interactingChainId: Hex = this.#chainId;
     if (networkClientId) {
       interactingChainId = this.messagingSystem.call(
         'NetworkController:getNetworkClientById',
@@ -506,9 +506,8 @@ export class TokensController extends BaseController<
 
     // Used later to dedupe imported tokens
     const newTokensMap = [
-      ...(allTokens[interactingChainId ?? this.#chainId]?.[
-        this.#getSelectedAccount().address
-      ] || []),
+      ...(allTokens[interactingChainId]?.[this.#getSelectedAccount().address] ||
+        []),
       ...tokensToImport,
     ].reduce(
       (output, token) => {
@@ -557,11 +556,13 @@ export class TokensController extends BaseController<
         });
 
       this.update((state) => {
-        state.tokens = newTokens;
+        if (interactingChainId === this.#chainId) {
+          state.tokens = newTokens;
+          state.detectedTokens = newDetectedTokens;
+          state.ignoredTokens = newIgnoredTokens;
+        }
         state.allTokens = newAllTokens;
-        state.detectedTokens = newDetectedTokens;
         state.allDetectedTokens = newAllDetectedTokens;
-        state.ignoredTokens = newIgnoredTokens;
         state.allIgnoredTokens = newAllIgnoredTokens;
       });
     } finally {

packages/base-controller/src/BaseControllerV1.test.ts

@@ -16,7 +16,7 @@ import {
   countControllerStateMetadata,
   getCountMessenger,
 } from './BaseControllerV2.test';
-import { ControllerMessenger } from './Messenger';
+import { Messenger } from './Messenger';
 
 const STATE = { name: 'foo' };
 const CONFIG = { disabled: true };
@@ -36,12 +36,12 @@ describe('isBaseControllerV1', () => {
   });
 
   it('should return false if passed a V2 controller', () => {
-    const controllerMessenger = new ControllerMessenger<
+    const messenger = new Messenger<
       CountControllerAction,
       CountControllerEvent
     >();
     const controller = new CountController({
-      messenger: getCountMessenger(controllerMessenger),
+      messenger: getCountMessenger(messenger),
       name: countControllerName,
       state: { count: 0 },
       metadata: countControllerStateMetadata,