From 55a15145131a358d9d8f72bb16a4675cfa63e45f Mon Sep 17 00:00:00 2001
From: Bernardo Garces Chapero <bernardo.chapero@consensys.net>
Date: Thu, 15 Jun 2023 15:12:59 +0100
Subject: [PATCH] fix signature controller patch (#19607)

---
 ...ure-controller-npm-3.0.0-8771b6885e.patch} |  9 ++++++---
 package.json                                  |  2 +-
 yarn.lock                                     | 20 ++++++++++++++++++-
 3 files changed, 26 insertions(+), 5 deletions(-)
 rename .yarn/patches/{@metamask-signature-controller-npm-2.0.0-f441f2596e.patch => @metamask-signature-controller-npm-3.0.0-8771b6885e.patch} (64%)

diff --git a/.yarn/patches/@metamask-signature-controller-npm-2.0.0-f441f2596e.patch b/.yarn/patches/@metamask-signature-controller-npm-3.0.0-8771b6885e.patch
similarity index 64%
rename from .yarn/patches/@metamask-signature-controller-npm-2.0.0-f441f2596e.patch
rename to .yarn/patches/@metamask-signature-controller-npm-3.0.0-8771b6885e.patch
index 999541da8..4a2682995 100644
--- a/.yarn/patches/@metamask-signature-controller-npm-2.0.0-f441f2596e.patch
+++ b/.yarn/patches/@metamask-signature-controller-npm-3.0.0-8771b6885e.patch
@@ -1,14 +1,17 @@
 diff --git a/dist/SignatureController.js b/dist/SignatureController.js
-index 59dc5974218e8d073b65969154f35ada3fd9e8ab..5b16d09dcacf49caa15d11c9db7c34569eb36412 100644
+index b39d274f4547ab4e8b647293199ec21c4a9e38ca..288e55c97c3e4a234874dd8b8986ba77576b0dc4 100644
 --- a/dist/SignatureController.js
 +++ b/dist/SignatureController.js
-@@ -302,9 +302,9 @@ _SignatureController_keyringController = new WeakMap(), _SignatureController_isE
+@@ -308,12 +308,12 @@ _SignatureController_keyringController = new WeakMap(), _SignatureController_isE
          const messageId = msgParams.metamaskId;
          try {
              const cleanMessageParams = yield messageManager.approveMessage(msgParams);
 +            __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_acceptApproval).call(this, messageId);
              const signature = yield getSignature(cleanMessageParams);
-             messageManager.setMessageStatusSigned(messageId, signature);
+             this.hub.emit(`${methodName}:signed`, { signature, messageId });
+             if (!cleanMessageParams.deferSetAsSigned) {
+                 messageManager.setMessageStatusSigned(messageId, signature);
+             }
 -            __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_acceptApproval).call(this, messageId);
              return __classPrivateFieldGet(this, _SignatureController_getAllState, "f").call(this);
          }
diff --git a/package.json b/package.json
index 72188863a..cdd4a9b91 100644
--- a/package.json
+++ b/package.json
@@ -196,7 +196,7 @@
     "request@^2.83.0": "patch:request@npm%3A2.88.2#./.yarn/patches/request-npm-2.88.2-f4a57c72c4.patch",
     "request@^2.88.2": "patch:request@npm%3A2.88.2#./.yarn/patches/request-npm-2.88.2-f4a57c72c4.patch",
     "request@^2.85.0": "patch:request@npm%3A2.88.2#./.yarn/patches/request-npm-2.88.2-f4a57c72c4.patch",
-    "@metamask/signature-controller@^2.0.0": "patch:@metamask/signature-controller@npm%3A2.0.0#./.yarn/patches/@metamask-signature-controller-npm-2.0.0-f441f2596e.patch"
+    "@metamask/signature-controller@^3.0.0": "patch:@metamask/signature-controller@npm%3A3.0.0#./.yarn/patches/@metamask-signature-controller-npm-3.0.0-8771b6885e.patch"
   },
   "dependencies": {
     "@actions/core": "^1.10.0",
diff --git a/yarn.lock b/yarn.lock
index 64b945686..9978c6720 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4642,7 +4642,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/signature-controller@npm:^3.0.0":
+"@metamask/signature-controller@npm:3.0.0":
   version: 3.0.0
   resolution: "@metamask/signature-controller@npm:3.0.0"
   dependencies:
@@ -4660,6 +4660,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/signature-controller@patch:@metamask/signature-controller@npm%3A3.0.0#./.yarn/patches/@metamask-signature-controller-npm-3.0.0-8771b6885e.patch::locator=metamask-crx%40workspace%3A.":
+  version: 3.0.0
+  resolution: "@metamask/signature-controller@patch:@metamask/signature-controller@npm%3A3.0.0#./.yarn/patches/@metamask-signature-controller-npm-3.0.0-8771b6885e.patch::version=3.0.0&hash=7fee95&locator=metamask-crx%40workspace%3A."
+  dependencies:
+    "@metamask/approval-controller": ^3.0.0
+    "@metamask/base-controller": ^3.0.0
+    "@metamask/controller-utils": ^4.0.0
+    "@metamask/message-manager": ^6.0.0
+    "@metamask/utils": ^5.0.2
+    eth-rpc-errors: ^4.0.2
+    ethereumjs-util: ^7.0.10
+    immer: ^9.0.6
+  peerDependencies:
+    "@metamask/approval-controller": ^3.0.0
+  checksum: 379cceaceaa4e120bbf9547b74d709f2a93117a17ec460e22e8935a54a1d10528f435563f6d9dcb1c4b9f521286033b23d5ec14063ea1c6f753953f5e0984a70
+  languageName: node
+  linkType: hard
+
 "@metamask/slip44@npm:^3.0.0":
   version: 3.0.0
   resolution: "@metamask/slip44@npm:3.0.0"