From be7900e9e907ef762c34126c56ef9c85be16bc0c Mon Sep 17 00:00:00 2001
From: Frederik Bolding <frederik.bolding@gmail.com>
Date: Tue, 13 Jun 2023 15:04:28 +0200
Subject: [PATCH] [FLASK] Bump RateLimitController to v3 (#19578)

* Bump RateLimitController to latest

* Regen LavaMoat policies
---
 app/scripts/metamask-controller.js      | 40 ++++++++++++++-----------
 lavamoat/browserify/desktop/policy.json |  7 +----
 lavamoat/browserify/flask/policy.json   |  7 +----
 package.json                            |  2 +-
 yarn.lock                               | 14 ++++-----
 5 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 32a09419c..57948c48b 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -894,29 +894,33 @@ export default class MetamaskController extends EventEmitter {
         name: 'RateLimitController',
       }),
       implementations: {
-        showNativeNotification: (origin, message) => {
-          const subjectMetadataState = this.controllerMessenger.call(
-            'SubjectMetadataController:getState',
-          );
+        showNativeNotification: {
+          method: (origin, message) => {
+            const subjectMetadataState = this.controllerMessenger.call(
+              'SubjectMetadataController:getState',
+            );
 
-          const originMetadata = subjectMetadataState.subjectMetadata[origin];
+            const originMetadata = subjectMetadataState.subjectMetadata[origin];
 
-          this.platform
-            ._showNotification(originMetadata?.name ?? origin, message)
-            .catch((error) => {
-              log.error('Failed to create notification', error);
-            });
+            this.platform
+              ._showNotification(originMetadata?.name ?? origin, message)
+              .catch((error) => {
+                log.error('Failed to create notification', error);
+              });
 
-          return null;
+            return null;
+          },
         },
-        showInAppNotification: (origin, message) => {
-          this.controllerMessenger.call(
-            'NotificationController:show',
-            origin,
-            message,
-          );
+        showInAppNotification: {
+          method: (origin, message) => {
+            this.controllerMessenger.call(
+              'NotificationController:show',
+              origin,
+              message,
+            );
 
-          return null;
+            return null;
+          },
         },
       },
     });
diff --git a/lavamoat/browserify/desktop/policy.json b/lavamoat/browserify/desktop/policy.json
index 22cc6cf78..3390e911e 100644
--- a/lavamoat/browserify/desktop/policy.json
+++ b/lavamoat/browserify/desktop/policy.json
@@ -1849,15 +1849,10 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/rate-limit-controller>@metamask/base-controller": true,
+        "@metamask/base-controller": true,
         "eth-rpc-errors": true
       }
     },
-    "@metamask/rate-limit-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/rpc-methods-flask": {
       "packages": {
         "@metamask/key-tree": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 22cc6cf78..3390e911e 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -1849,15 +1849,10 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/rate-limit-controller>@metamask/base-controller": true,
+        "@metamask/base-controller": true,
         "eth-rpc-errors": true
       }
     },
-    "@metamask/rate-limit-controller>@metamask/base-controller": {
-      "packages": {
-        "immer": true
-      }
-    },
     "@metamask/rpc-methods-flask": {
       "packages": {
         "@metamask/key-tree": true,
diff --git a/package.json b/package.json
index ea9036afc..6874074e9 100644
--- a/package.json
+++ b/package.json
@@ -255,7 +255,7 @@
     "@metamask/phishing-controller": "^3.0.0",
     "@metamask/post-message-stream": "^6.0.0",
     "@metamask/providers": "^10.2.1",
-    "@metamask/rate-limit-controller": "^2.0.0",
+    "@metamask/rate-limit-controller": "^3.0.0",
     "@metamask/rpc-methods": "^0.32.2",
     "@metamask/rpc-methods-flask": "npm:@metamask/rpc-methods@0.34.0-flask.1",
     "@metamask/safe-event-emitter": "^2.0.0",
diff --git a/yarn.lock b/yarn.lock
index 540669b20..d1976169d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4555,14 +4555,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/rate-limit-controller@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@metamask/rate-limit-controller@npm:2.0.0"
+"@metamask/rate-limit-controller@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@metamask/rate-limit-controller@npm:3.0.0"
   dependencies:
-    "@metamask/base-controller": ^2.0.0
-    eth-rpc-errors: ^4.0.0
+    "@metamask/base-controller": ^3.0.0
+    eth-rpc-errors: ^4.0.2
     immer: ^9.0.6
-  checksum: da0b3cb6607201b07ee54f81a4ce8ce3ce047acde33c5f483aa0c8c907bcbe32e70944d95cf4f0df5d4b664388be832320d6973cf61cd00e22f81d16ff0ddfd2
+  checksum: 9bf1a99056303a1a23e3ea1984f2db2635f5a09edc307e114e6246db1addac878f8d8e89be862d2f1ad06248c0d4e4613d648caf191dc42fbdc0d310e6f8896f
   languageName: node
   linkType: hard
 
@@ -24066,7 +24066,7 @@ __metadata:
     "@metamask/phishing-warning": ^2.1.0
     "@metamask/post-message-stream": ^6.0.0
     "@metamask/providers": ^10.2.1
-    "@metamask/rate-limit-controller": ^2.0.0
+    "@metamask/rate-limit-controller": ^3.0.0
     "@metamask/rpc-methods": ^0.32.2
     "@metamask/rpc-methods-flask": "npm:@metamask/rpc-methods@0.34.0-flask.1"
     "@metamask/safe-event-emitter": ^2.0.0