WIP

MetaMask · Feb 14, 2024 · 3729bc0 · 3729bc0
1 parent c4c12ec
commit 3729bc0
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 19 deletions.
diff --git a/app/scripts/background.js b/app/scripts/background.js
@@ -797,6 +797,11 @@ export function setupController(
     updateBadge,
   );
 
+  controller.controllerMessenger.subscribe(
+    METAMASK_CONTROLLER_EVENTS.QUEUED_REQUEST_STATE_CHANGE,
+    updateBadge,
+  );
+
   controller.txController.initApprovals();
 
   /**
@@ -822,7 +827,7 @@ export function setupController(
   function getUnapprovedTransactionCount() {
     let count = controller.appStateController.waitingForUnlock.length;
     if (controller.preferencesController.getUseRequestQueue()) {
-      count += controller.queuedRequestController.length();
+      count += controller.queuedRequestController.state.queuedRequestCount;
     } else {
       count += controller.approvalController.getTotalApprovalCount();
     }

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
@@ -304,6 +304,7 @@ export const METAMASK_CONTROLLER_EVENTS = {
   UPDATE_BADGE: 'updateBadge',
   // TODO: Add this and similar enums to the `controllers` repo and export them
   APPROVAL_STATE_CHANGE: 'ApprovalController:stateChange',
+  QUEUED_REQUEST_STATE_CHANGE: 'QueuedRequestController:stateChange',
 };
 
 // stream channels
@@ -396,6 +397,12 @@ export default class MetamaskController extends EventEmitter {
     this.queuedRequestController = new QueuedRequestController({
       messenger: this.controllerMessenger.getRestricted({
         name: 'QueuedRequestController',
+        allowedActions: [
+          'NetworkController:getState',
+          'NetworkController:setActiveNetwork',
+          'SelectedNetworkController:getNetworkClientIdForDomain',
+          'SelectedNetworkController:setNetworkClientIdForDomain',
+        ],
       }),
     });
 
@@ -4652,7 +4659,9 @@ export default class MetamaskController extends EventEmitter {
     }
 
     const requestQueueMiddleware = createQueuedRequestMiddleware({
-      messenger: this.controllerMessenger,
+      enqueueRequest: this.queuedRequestController.enqueueRequest.bind(
+        this.queuedRequestController,
+      ),
       useRequestQueue: this.preferencesController.getUseRequestQueue.bind(
         this.preferencesController,
       ),

diff --git a/package.json b/package.json
@@ -219,7 +219,8 @@
     "nonce-tracker@npm:^3.0.0": "patch:nonce-tracker@npm%3A3.0.0#~/.yarn/patches/nonce-tracker-npm-3.0.0-c5e9a93f9d.patch",
     "@trezor/connect-web": "9.0.11",
     "lavamoat-core@npm:^15.1.1": "patch:lavamoat-core@npm%3A15.1.1#~/.yarn/patches/lavamoat-core-npm-15.1.1-51fbe39988.patch",
-    "tar-stream@npm:^3.1.6": "patch:tar-stream@npm%3A3.1.6#~/.yarn/patches/tar-stream-npm-3.1.6-ce3ac17e49.patch"
+    "tar-stream@npm:^3.1.6": "patch:tar-stream@npm%3A3.1.6#~/.yarn/patches/tar-stream-npm-3.1.6-ce3ac17e49.patch",
+    "@metamask/queued-request-controller@^0.3.0": "npm:@metamask-previews/queued-request-controller@0.4.0-preview.b9f6d86"
   },
   "dependencies": {
     "@babel/runtime": "^7.23.2",

diff --git a/yarn.lock b/yarn.lock
@@ -4618,21 +4618,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/queued-request-controller@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "@metamask/queued-request-controller@npm:0.3.0"
+"@metamask/queued-request-controller@npm:@metamask-previews/queued-request-controller@0.4.0-preview.b9f6d86":
+  version: 0.4.0-preview.b9f6d86
+  resolution: "@metamask-previews/queued-request-controller@npm:0.4.0-preview.b9f6d86"
   dependencies:
-    "@metamask/base-controller": "npm:^4.0.1"
-    "@metamask/controller-utils": "npm:^8.0.1"
-    "@metamask/json-rpc-engine": "npm:^7.3.1"
+    "@metamask/base-controller": "npm:^4.1.1"
+    "@metamask/controller-utils": "npm:^8.0.2"
+    "@metamask/json-rpc-engine": "npm:^7.3.2"
     "@metamask/rpc-errors": "npm:^6.1.0"
-    "@metamask/swappable-obj-proxy": "npm:^2.1.0"
-    "@metamask/utils": "npm:^8.2.0"
+    "@metamask/swappable-obj-proxy": "npm:^2.2.0"
+    "@metamask/utils": "npm:^8.3.0"
   peerDependencies:
-    "@metamask/approval-controller": ^5.1.1
-    "@metamask/network-controller": ^17.1.0
-    "@metamask/selected-network-controller": ^6.0.0
-  checksum: 47988f3999f8ab45dfbbc8fde796ce4c8ebc405abb79bc165dc1faf777db6190942e220df76e0a7d0355d8de5a635cc41089fc75825eb4b6047ebf1c85b44e6a
+    "@metamask/approval-controller": ^5.1.2
+    "@metamask/network-controller": ^17.2.0
+    "@metamask/selected-network-controller": ^7.0.1
+  checksum: c6e1fd39209e3e19d25c4272d690cc0bd36443c186ab87c15412f488e0c352ea43e6b21ed84ba628374bd79897a22ac96b1d076e6ec4dda292ae3c487176f4c9
   languageName: node
   linkType: hard
 
@@ -33056,11 +33056,11 @@ __metadata:
   linkType: hard
 
 "uint8arrays@npm:^2.1.3":
-  version: 2.1.10
-  resolution: "uint8arrays@npm:2.1.10"
+  version: 2.1.5
+  resolution: "uint8arrays@npm:2.1.5"
   dependencies:
-    multiformats: "npm:^9.4.2"
-  checksum: 63ceb5fecc09de69641531c847e0b435d15a73587e40d4db23ed9b8a1ebbe839ae39fe81a15ea6079cdf642fcf2583983f9a5d32726edc4bc5e87634f34e3bd5
+    multibase: "npm:^4.0.1"
+  checksum: 521a120ad21250004a95330d0501c87344c5072376b5d5d9ef642721f7913cc1880b823715e5d8829307a9dda73c3064283cb3a7442f0e85fef781cfca4f0334
   languageName: node
   linkType: hard