Merge branch 'main' into bump-to-yarn-v4

Author: mcmire

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

@@ -65,12 +65,20 @@ export type {
 } from './TokenListController';
 export { TokenListController } from './TokenListController';
 export type {
-  Token,
-  TokenRatesConfig,
   ContractExchangeRates,
-  TokenRatesState,
+  ContractMarketData,
+  Token,
+  TokenRatesControllerActions,
+  TokenRatesControllerEvents,
+  TokenRatesControllerGetStateAction,
+  TokenRatesControllerMessenger,
+  TokenRatesControllerState,
+  TokenRatesControllerStateChangeEvent,
+} from './TokenRatesController';
+export {
+  getDefaultTokenRatesControllerState,
+  TokenRatesController,
 } from './TokenRatesController';
-export { TokenRatesController } from './TokenRatesController';
 export type {
   TokensControllerState,
   TokensControllerActions,

packages/assets-controllers/src/TokenRatesController.ts

@@ -45,6 +45,7 @@
     "@metamask/controller-utils": "^11.0.0",
     "@types/punycode": "^2.1.0",
     "eth-phishing-detect": "^1.2.0",
+    "fastest-levenshtein": "^1.0.16",
     "punycode": "^2.1.1"
   },
   "devDependencies": {

packages/assets-controllers/src/index.ts

@@ -1,9 +1,9 @@
 import type { RestrictedControllerMessenger } from '@metamask/base-controller';
 import { BaseController } from '@metamask/base-controller';
 import { safelyExecute } from '@metamask/controller-utils';
-import PhishingDetector from 'eth-phishing-detect/src/detector';
 import { toASCII } from 'punycode/';
 
+import { PhishingDetector } from './PhishingDetector';
 import { applyDiffs, fetchTimeNow } from './utils';
 
 export const PHISHING_CONFIG_BASE_URL =