Merge branch 'main' into feat/disable-metametrics-basic-functionality

Author: mathieuartu

app/scripts/controller-init/confirmations/ppom-controller-init.test.ts

@@ -39,6 +39,7 @@ function buildControllerMock(
 }
 
 function buildInitRequestMock(): jest.Mocked<
+  // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
   ControllerInitRequest<PPOMControllerMessenger, PPOMControllerInitMessenger>
 > {
   const baseControllerMessenger = new Messenger();

app/scripts/controller-init/confirmations/ppom-controller-init.ts

@@ -9,6 +9,7 @@ import { PPOMControllerInitMessenger } from '../messengers/ppom-controller-messe
 
 export const PPOMControllerInit: ControllerInitFunction<
   PPOMController,
+  // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
   PPOMControllerMessenger,
   PPOMControllerInitMessenger
 > = (request) => {

app/scripts/controller-init/confirmations/transaction-controller-init.test.ts

@@ -39,6 +39,7 @@ function buildControllerMock(
 
 function buildInitRequestMock(): jest.Mocked<
   ControllerInitRequest<
+    // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
     TransactionControllerMessenger,
     TransactionControllerInitMessenger
   >

app/scripts/controller-init/confirmations/transaction-controller-init.ts

@@ -48,6 +48,7 @@ import { ControllerFlatState } from '../controller-list';
 
 export const TransactionControllerInit: ControllerInitFunction<
   TransactionController,
+  // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
   TransactionControllerMessenger,
   TransactionControllerInitMessenger
 > = (request) => {
@@ -188,6 +189,7 @@ function getApi(
 
 function getControllers(
   request: ControllerInitRequest<
+    // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
     TransactionControllerMessenger,
     TransactionControllerInitMessenger
   >,

app/scripts/controller-init/messengers/ppom-controller-messenger.ts

@@ -21,6 +21,7 @@ export type PPOMControllerInitMessenger = ReturnType<
 export function getPPOMControllerMessenger(
   messenger: Messenger<MessengerActions, MessengerEvents>,
 ): PPOMControllerMessenger {
+  // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
   return messenger.getRestricted({
     name: 'PPOMController',
     allowedEvents: [

app/scripts/controller-init/messengers/transaction-controller-messenger.ts

@@ -56,6 +56,7 @@ export type TransactionControllerInitMessenger = ReturnType<
 export function getTransactionControllerMessenger(
   messenger: Messenger<MessengerActions, MessengerEvents>,
 ): TransactionControllerMessenger {
+  // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
   return messenger.getRestricted({
     name: 'TransactionController',
     allowedActions: [

app/scripts/controller-init/snaps/cronjob-controller-init.ts

@@ -19,6 +19,7 @@ export const CronjobControllerInit: ControllerInitFunction<
     // with the expected type.
     // TODO: Look into the type mismatch.
     state: persistedState.CronjobController,
+    // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
     messenger: controllerMessenger,
   });
 

app/scripts/controller-init/snaps/execution-service-init.ts

@@ -53,6 +53,7 @@ export const ExecutionServiceInit: ControllerInitFunction<
       memStateKey: null,
       persistedStateKey: null,
       controller: new OffscreenExecutionService({
+        // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
         messenger: controllerMessenger,
         setupSnapProvider,
         offscreenPromise,
@@ -67,6 +68,7 @@ export const ExecutionServiceInit: ControllerInitFunction<
     memStateKey: null,
     persistedStateKey: null,
     controller: new IframeExecutionService({
+      // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
       messenger: controllerMessenger,
       iframeUrl: new URL(iframeUrl),
       setupSnapProvider,

app/scripts/controller-init/snaps/snap-insights-controller-init.ts

@@ -19,6 +19,7 @@ export const SnapInsightsControllerInit: ControllerInitFunction<
     // compatible with the expected type.
     // TODO: Look into the type mismatch.
     state: persistedState.SnapInsightsController,
+    // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
     messenger: controllerMessenger,
   });
 

app/scripts/controller-init/snaps/snap-interface-controller-init.ts

@@ -19,6 +19,7 @@ export const SnapInterfaceControllerInit: ControllerInitFunction<
     // with the expected type.
     // TODO: Look into the type mismatch.
     state: persistedState.SnapInterfaceController,
+    // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
     messenger: controllerMessenger,
   });
 

app/scripts/controller-init/snaps/snaps-registry-init.ts

@@ -22,6 +22,7 @@ export const SnapsRegistryInit: ControllerInitFunction<
     // with the expected type.
     // TODO: Look into the type mismatch.
     state: persistedState.SnapsRegistry,
+    // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
     messenger: controllerMessenger,
     refetchOnAllowlistMiss: requireAllowlist,
   });

app/scripts/controller-init/utils.ts

@@ -41,6 +41,7 @@ type ControllersToInitialize = 'PPOMController' | 'TransactionController';
 type InitFunction<Name extends ControllersToInitialize> =
   ControllerInitFunction<
     ControllerByName[Name],
+    // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
     ReturnType<(typeof CONTROLLER_MESSENGERS)[Name]['getMessenger']>,
     ReturnType<(typeof CONTROLLER_MESSENGERS)[Name]['getInitMessenger']>
   >;
@@ -100,6 +101,7 @@ export function initControllers({
     const messengerCallbacks = CONTROLLER_MESSENGERS[controllerName];
 
     const controllerMessengerCallback =
+      // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
       messengerCallbacks?.getMessenger as ControllerMessengerCallback;
 
     const initMessengerCallback =
@@ -118,7 +120,13 @@ export function initControllers({
       initMessenger,
     };
 
-    const result = initFunction(finalInitRequest);
+    // TODO: Remove @ts-expect-error once base-controller version mismatch is resolved
+    // Instead of suppressing all type errors, we'll be specific about the controllerMessenger mismatch
+    const result = initFunction({
+      ...finalInitRequest,
+      // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
+      controllerMessenger: finalInitRequest.controllerMessenger,
+    });
 
     const {
       controller,

app/scripts/lib/ComposableObservableStore.test.js

@@ -1,27 +1,7 @@
 import { ObservableStore } from '@metamask/obs-store';
-import {
-  BaseControllerV1,
-  BaseController,
-  Messenger,
-} from '@metamask/base-controller';
+import { BaseController, Messenger } from '@metamask/base-controller';
 import ComposableObservableStore from './ComposableObservableStore';
 
-class OldExampleController extends BaseControllerV1 {
-  name = 'OldExampleController';
-
-  defaultState = {
-    baz: 'baz',
-  };
-
-  constructor() {
-    super();
-    this.initialize();
-  }
-
-  updateBaz(contents) {
-    this.update({ baz: contents });
-  }
-}
 class ExampleController extends BaseController {
   static defaultState = {
     bar: 'bar',
@@ -81,17 +61,6 @@ describe('ComposableObservableStore', () => {
     expect(store.getState()).toStrictEqual({ TestStore: 'state' });
   });
 
-  it('should update structure with BaseControllerV1-based controller', () => {
-    const messenger = new Messenger();
-    const oldExampleController = new OldExampleController();
-    const store = new ComposableObservableStore({
-      controllerMessenger: messenger,
-    });
-    store.updateStructure({ OldExample: oldExampleController });
-    oldExampleController.updateBaz('state');
-    expect(store.getState()).toStrictEqual({ OldExample: { baz: 'state' } });
-  });
-
   it('should update structure with BaseController-based controller', () => {
     const messenger = new Messenger();
     const exampleController = new ExampleController({
@@ -113,21 +82,17 @@ describe('ComposableObservableStore', () => {
     const exampleController = new ExampleController({
       messenger,
     });
-    const oldExampleController = new OldExampleController();
     const store = new ComposableObservableStore({
       controllerMessenger: messenger,
     });
     store.updateStructure({
       Example: exampleController,
-      OldExample: oldExampleController,
       Store: exampleStore,
     });
     exampleStore.putState('state');
     exampleController.updateBar('state');
-    oldExampleController.updateBaz('state');
     expect(store.getState()).toStrictEqual({
       Example: { bar: 'state', baz: 'baz' },
-      OldExample: { baz: 'state' },
       Store: 'state',
     });
   });
@@ -138,23 +103,19 @@ describe('ComposableObservableStore', () => {
     const exampleController = new ExampleController({
       messenger,
     });
-    const oldExampleController = new OldExampleController();
     exampleStore.putState('state');
     exampleController.updateBar('state');
-    oldExampleController.updateBaz('state');
     const store = new ComposableObservableStore({
       controllerMessenger: messenger,
     });
 
     store.updateStructure({
       Example: exampleController,
-      OldExample: oldExampleController,
       Store: exampleStore,
     });
 
     expect(store.getState()).toStrictEqual({
       Example: { bar: 'state', baz: 'baz' },
-      OldExample: { baz: 'state' },
       Store: 'state',
     });
   });
@@ -182,24 +143,20 @@ describe('ComposableObservableStore', () => {
     const exampleController = new ExampleController({
       messenger,
     });
-    const oldExampleController = new OldExampleController();
     exampleStore.putState('state');
     exampleController.updateBar('state');
-    oldExampleController.updateBaz('state');
     const store = new ComposableObservableStore({
       controllerMessenger: messenger,
       persist: true,
     });
 
     store.updateStructure({
       Example: exampleController,
-      OldExample: oldExampleController,
       Store: exampleStore,
     });
 
     expect(store.getState()).toStrictEqual({
       Example: { bar: 'state' },
-      OldExample: { baz: 'state' },
       Store: 'state',
     });
   });
@@ -210,18 +167,15 @@ describe('ComposableObservableStore', () => {
     const barController = new ExampleController({
       messenger,
     });
-    const bazController = new OldExampleController();
     const store = new ComposableObservableStore({
       config: {
         FooStore: fooStore,
         BarStore: barController,
-        BazStore: bazController,
       },
       controllerMessenger: messenger,
       state: {
         FooStore: fooStore.getState(),
         BarStore: barController.state,
-        BazStore: bazController.state,
       },
     });
     expect(store.getFlatState()).toStrictEqual({

app/scripts/lib/snap-keyring/snap-keyring.ts

@@ -126,8 +126,7 @@ export const snapKeyringBuilder = (
   isSnapPreinstalled: (snapId: string) => boolean,
 ) => {
   const builder = (() => {
-    // TODO: Replace `any` with type
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
     return new SnapKeyring(controllerMessenger, {
       addressExists: async (address) => {
         const addresses = await controllerMessenger.call(

app/scripts/lib/transaction/smart-transactions.test.ts

@@ -102,6 +102,7 @@ function withRequest<ReturnValue>(
   });
 
   const smartTransactionsController = new SmartTransactionsController({
+    // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
     messenger: smartTransactionsControllerMessenger,
     getNonceLock: jest.fn(),
     confirmExternalTransaction: jest.fn(),
@@ -175,6 +176,7 @@ function withRequest<ReturnValue>(
 
   return fn({
     request,
+    // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
     messenger: smartTransactionsControllerMessenger,
     startFlowSpy,
     addRequestSpy,