remove queuedRequestPreference

MetaMask · Nov 15, 2024 · c4089a8 · c4089a8
1 parent 0f69373
commit c4089a8
Show file tree

Hide file tree

Showing 4 changed files with 374 additions and 728 deletions.
diff --git a/packages/queued-request-controller/src/QueuedRequestMiddleware.test.ts b/packages/queued-request-controller/src/QueuedRequestMiddleware.test.ts
@@ -86,7 +86,6 @@ describe('createQueuedRequestMiddleware', () => {
     const mockEnqueueRequest = getMockEnqueueRequest();
     const middleware = buildQueuedRequestMiddleware({
       enqueueRequest: mockEnqueueRequest,
-      useRequestQueue: () => true,
     });
 
     const request = {
@@ -105,7 +104,7 @@ describe('createQueuedRequestMiddleware', () => {
     const mockEnqueueRequest = getMockEnqueueRequest();
     const middleware = buildQueuedRequestMiddleware({
       enqueueRequest: mockEnqueueRequest,
-      useRequestQueue: () => true,
+
       shouldEnqueueRequest: ({ method }) =>
         method === 'method_with_confirmation',
     });
@@ -145,7 +144,6 @@ describe('createQueuedRequestMiddleware', () => {
   it('calls next after a request is queued and processed', async () => {
     const middleware = buildQueuedRequestMiddleware({
       enqueueRequest: getMockEnqueueRequest(),
-      useRequestQueue: () => true,
     });
     const request = {
       ...getRequestDefaults(),
@@ -167,7 +165,7 @@ describe('createQueuedRequestMiddleware', () => {
         enqueueRequest: jest
           .fn()
           .mockRejectedValue(new Error('enqueuing error')),
-        useRequestQueue: () => true,
+
         shouldEnqueueRequest: () => true,
       });
       const request = {
@@ -191,7 +189,7 @@ describe('createQueuedRequestMiddleware', () => {
         enqueueRequest: jest
           .fn()
           .mockRejectedValue(new Error('enqueuing error')),
-        useRequestQueue: () => true,
+
         shouldEnqueueRequest: () => true,
       });
       const request = {
@@ -271,7 +269,6 @@ function buildQueuedRequestMiddleware(
 ) {
   const options = {
     enqueueRequest: getMockEnqueueRequest(),
-    useRequestQueue: () => false,
     shouldEnqueueRequest: () => false,
     ...overrideOptions,
   };

diff --git a/packages/queued-request-controller/src/QueuedRequestMiddleware.ts b/packages/queued-request-controller/src/QueuedRequestMiddleware.ts
@@ -38,27 +38,23 @@ function hasRequiredMetadata(
  *
  * @param options - Configuration options.
  * @param options.enqueueRequest - A method for enqueueing a request.
- * @param options.useRequestQueue - A function that determines if the request queue feature is enabled.
  * @param options.shouldEnqueueRequest - A function that returns if a request should be handled by the QueuedRequestController.
  * @returns The JSON-RPC middleware that manages queued requests.
  */
 export const createQueuedRequestMiddleware = ({
   enqueueRequest,
-  useRequestQueue,
   shouldEnqueueRequest,
 }: {
   enqueueRequest: QueuedRequestController['enqueueRequest'];
-  useRequestQueue: () => boolean;
   shouldEnqueueRequest: (
     request: QueuedRequestMiddlewareJsonRpcRequest,
   ) => boolean;
 }): JsonRpcMiddleware<JsonRpcParams, Json> => {
   return createAsyncMiddleware(async (req: JsonRpcRequest, res, next) => {
     hasRequiredMetadata(req);
 
-    // if the request queue feature is turned off, or this method is not a confirmation method
-    // bypass the queue completely
-    if (!useRequestQueue() || !shouldEnqueueRequest(req)) {
+    // if this method is not a confirmation method bypass the queue completely
+    if (!shouldEnqueueRequest(req)) {
       return await next();
     }
 

diff --git a/packages/selected-network-controller/src/SelectedNetworkController.ts b/packages/selected-network-controller/src/SelectedNetworkController.ts
@@ -102,10 +102,6 @@ export type SelectedNetworkControllerMessenger = RestrictedControllerMessenger<
 export type SelectedNetworkControllerOptions = {
   state?: SelectedNetworkControllerState;
   messenger: SelectedNetworkControllerMessenger;
-  useRequestQueuePreference: boolean;
-  onPreferencesStateChange: (
-    listener: (preferencesState: { useRequestQueue: boolean }) => void,
-  ) => void;
   domainProxyMap: Map<Domain, NetworkProxy>;
 };
 
@@ -124,23 +120,17 @@ export class SelectedNetworkController extends BaseController<
 > {
   #domainProxyMap: Map<Domain, NetworkProxy>;
 
-  #useRequestQueuePreference: boolean;
-
   /**
    * Construct a SelectedNetworkController controller.
    *
    * @param options - The controller options.
    * @param options.messenger - The restricted controller messenger for the EncryptionPublicKey controller.
    * @param options.state - The controllers initial state.
-   * @param options.useRequestQueuePreference - A boolean indicating whether to use the request queue preference.
-   * @param options.onPreferencesStateChange - A callback that is called when the preference state changes.
    * @param options.domainProxyMap - A map for storing domain-specific proxies that are held in memory only during use.
    */
   constructor({
     messenger,
     state = getDefaultState(),
-    useRequestQueuePreference,
-    onPreferencesStateChange,
     domainProxyMap,
   }: SelectedNetworkControllerOptions) {
     super({
@@ -149,7 +139,6 @@ export class SelectedNetworkController extends BaseController<
       messenger,
       state,
     });
-    this.#useRequestQueuePreference = useRequestQueuePreference;
     this.#domainProxyMap = domainProxyMap;
     this.#registerMessageHandlers();
 
@@ -247,21 +236,6 @@ export class SelectedNetworkController extends BaseController<
         }
       },
     );
-
-    onPreferencesStateChange(({ useRequestQueue }) => {
-      if (this.#useRequestQueuePreference !== useRequestQueue) {
-        if (!useRequestQueue) {
-          // Loop through all domains and points each domain's proxy
-          // to the NetworkController's own proxy of the globally selected networkClient
-          Object.keys(this.state.domains).forEach((domain) => {
-            this.#unsetNetworkClientIdForDomain(domain);
-          });
-        } else {
-          this.#resetAllPermissionedDomains();
-        }
-        this.#useRequestQueuePreference = useRequestQueue;
-      }
-    });
   }
 
   #registerMessageHandlers(): void {
@@ -347,10 +321,6 @@ export class SelectedNetworkController extends BaseController<
     domain: Domain,
     networkClientId: NetworkClientId,
   ) {
-    if (!this.#useRequestQueuePreference) {
-      return;
-    }
-
     if (domain === METAMASK_DOMAIN) {
       throw new Error(
         `NetworkClientId for domain "${METAMASK_DOMAIN}" cannot be set on the SelectedNetworkController`,
@@ -373,9 +343,6 @@ export class SelectedNetworkController extends BaseController<
   getNetworkClientIdForDomain(domain: Domain): NetworkClientId {
     const { selectedNetworkClientId: metamaskSelectedNetworkClientId } =
       this.messagingSystem.call('NetworkController:getState');
-    if (!this.#useRequestQueuePreference) {
-      return metamaskSelectedNetworkClientId;
-    }
     return this.state.domains[domain] ?? metamaskSelectedNetworkClientId;
   }
 
@@ -386,6 +353,7 @@ export class SelectedNetworkController extends BaseController<
    * @returns The proxy and block tracker proxies.
    */
   getProviderAndBlockTracker(domain: Domain): NetworkProxy {
+    console.log('domain', domain);
     // If the domain is 'metamask' or a snap, return the NetworkController's globally selected network client proxy
     if (
       domain === METAMASK_DOMAIN ||
@@ -394,6 +362,7 @@ export class SelectedNetworkController extends BaseController<
       const networkClient = this.messagingSystem.call(
         'NetworkController:getSelectedNetworkClient',
       );
+      console.log('networkClient', networkClient);
       if (networkClient === undefined) {
         throw new Error('Selected network not initialized');
       }
@@ -403,10 +372,7 @@ export class SelectedNetworkController extends BaseController<
     let networkProxy = this.#domainProxyMap.get(domain);
     if (networkProxy === undefined) {
       let networkClient;
-      if (
-        this.#useRequestQueuePreference &&
-        this.#domainHasPermissions(domain)
-      ) {
+      if (this.#domainHasPermissions(domain)) {
         const networkClientId = this.getNetworkClientIdForDomain(domain);
         networkClient = this.messagingSystem.call(
           'NetworkController:getNetworkClientById',