Merge branch 'main' into mrtenz/permitted-handler-type

MetaMask · Apr 19, 2023 · 90bc86c · 90bc86c
2 parents 9d183f3 + c8c9f38
commit 90bc86c
Show file tree

Hide file tree

Showing 30 changed files with 1,482 additions and 583 deletions.
diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json
@@ -33,6 +33,7 @@
     "@ethersproject/contracts": "^5.7.0",
     "@ethersproject/providers": "^5.7.0",
     "@metamask/abi-utils": "^1.1.0",
+    "@metamask/approval-controller": "workspace:^",
     "@metamask/base-controller": "workspace:^",
     "@metamask/contract-metadata": "^2.3.1",
     "@metamask/controller-utils": "workspace:^",
@@ -68,6 +69,7 @@
     "typescript": "~4.6.3"
   },
   "peerDependencies": {
+    "@metamask/approval-controller": "workspace:^",
     "@metamask/network-controller": "workspace:^"
   },
   "engines": {

diff --git a/packages/assets-controllers/src/TokenBalancesController.test.ts b/packages/assets-controllers/src/TokenBalancesController.test.ts
@@ -6,7 +6,10 @@ import {
 } from '@metamask/network-controller';
 import { PreferencesController } from '@metamask/preferences-controller';
 import { ControllerMessenger } from '@metamask/base-controller';
-import { TokensController } from './TokensController';
+import {
+  TokensController,
+  TokensControllerMessenger,
+} from './TokensController';
 import { Token } from './TokenRatesController';
 import { AssetsContractController } from './AssetsContractController';
 import {
@@ -142,6 +145,7 @@ describe('TokenBalancesController', () => {
       onPreferencesStateChange: (listener) => preferences.subscribe(listener),
       onNetworkStateChange: (listener) =>
         messenger.subscribe('NetworkController:stateChange', listener),
+      messenger: undefined as unknown as TokensControllerMessenger,
     });
     const address = '0x86fa049857e0209aa7d9e616f7eb3b3b78ecfdb0';
     const tokenBalances = new TokenBalancesController(
@@ -177,6 +181,7 @@ describe('TokenBalancesController', () => {
       onPreferencesStateChange: (listener) => preferences.subscribe(listener),
       onNetworkStateChange: (listener) =>
         messenger.subscribe('NetworkController:stateChange', listener),
+      messenger: undefined as unknown as TokensControllerMessenger,
     });
     const errorMsg = 'Failed to get balance';
     const address = '0x86fa049857e0209aa7d9e616f7eb3b3b78ecfdb0';
@@ -229,6 +234,7 @@ describe('TokenBalancesController', () => {
       onPreferencesStateChange: (listener) => preferences.subscribe(listener),
       onNetworkStateChange: (listener) =>
         messenger.subscribe('NetworkController:stateChange', listener),
+      messenger: undefined as unknown as TokensControllerMessenger,
     });
 
     const stub = stubCreateEthers(tokensController, false);

diff --git a/packages/assets-controllers/src/TokenDetectionController.test.ts b/packages/assets-controllers/src/TokenDetectionController.test.ts
@@ -11,7 +11,10 @@ import {
 import { NetworksChainId, NetworkType } from '@metamask/controller-utils';
 import { PreferencesController } from '@metamask/preferences-controller';
 import { ControllerMessenger } from '@metamask/base-controller';
-import { TokensController } from './TokensController';
+import {
+  TokensController,
+  TokensControllerMessenger,
+} from './TokensController';
 import { TokenDetectionController } from './TokenDetectionController';
 import {
   TokenListController,
@@ -165,6 +168,7 @@ describe('TokenDetectionController', () => {
       onPreferencesStateChange: (listener) => preferences.subscribe(listener),
       onNetworkStateChange: (listener) =>
         onNetworkStateChangeListeners.push(listener),
+      messenger: undefined as unknown as TokensControllerMessenger,
     });
 
     const tokenListSetup = setupTokenListController(controllerMessenger);

diff --git a/packages/assets-controllers/src/TokenRatesController.test.ts b/packages/assets-controllers/src/TokenRatesController.test.ts
@@ -7,7 +7,10 @@ import {
 } from '@metamask/network-controller';
 import { ControllerMessenger } from '@metamask/base-controller';
 import { TokenRatesController } from './TokenRatesController';
-import { TokensController } from './TokensController';
+import {
+  TokensController,
+  TokensControllerMessenger,
+} from './TokensController';
 
 const COINGECKO_API = 'https://api.coingecko.com/api/v3';
 const COINGECKO_ETH_PATH = '/simple/token_price/ethereum';
@@ -219,6 +222,7 @@ describe('TokenRatesController', () => {
       onPreferencesStateChange: (listener) => preferences.subscribe(listener),
       onNetworkStateChange: (listener) =>
         messenger.subscribe('NetworkController:stateChange', listener),
+      messenger: undefined as unknown as TokensControllerMessenger,
     });
     const controller = new TokenRatesController(
       {