From f115327aa474696e336f67bd75ce8d8a094c7d0d Mon Sep 17 00:00:00 2001 From: Frank von Hoven <141057783+frankvonhoven@users.noreply.github.com> Date: Thu, 2 May 2024 18:55:48 -0500 Subject: [PATCH 1/4] fix: upgrade permission-controller to 8.0.0 --- ios/Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 5b9ca46ccfd..56b9f77ab69 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1028,7 +1028,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Base64: cecfb41a004124895a7bcee567a89bae5a89d49b - boost: 7dcd2de282d72e344012f7d6564d024930a6a440 + boost: 57d2868c099736d80fcd648bf211b4431e51a558 Branch: 4ac024cb3c29b0ef628048694db3c4cfa679beb0 BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 From 39c7c9f7e3e3243895c7c8c9ca252b3166f6c530 Mon Sep 17 00:00:00 2001 From: Frank von Hoven <141057783+frankvonhoven@users.noreply.github.com> Date: Fri, 3 May 2024 11:41:37 -0500 Subject: [PATCH 2/4] fix: update permission-controller to 8.0.0 --- package.json | 2 +- yarn.lock | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 44bbeaf33a1..9ab3406d1ea 100644 --- a/package.json +++ b/package.json @@ -152,7 +152,7 @@ "@metamask/keyring-controller": "^9.0.0", "@metamask/logging-controller": "^1.0.1", "@metamask/network-controller": "^15.0.0", - "@metamask/permission-controller": "7.1.0", + "@metamask/permission-controller": "8.0.0", "@metamask/phishing-controller": "^8.0.0", "@metamask/post-message-stream": "8.0.0", "@metamask/ppom-validator": "0.29.0", diff --git a/yarn.lock b/yarn.lock index 6b5616e326d..0f3b8737aeb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4264,22 +4264,7 @@ "@metamask/safe-event-emitter" "^2.0.0" through2 "^2.0.3" -"@metamask/permission-controller@7.1.0", "@metamask/permission-controller@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@metamask/permission-controller/-/permission-controller-7.1.0.tgz#e6a2e6c66e8b1c4a46a59eac6fdbdc20d0d7d19d" - integrity sha512-CrE+TU1MQSMgQJ3PDV3KsDD+mhRr+KQ40/XNL/Vk3ShKHqOkCpZLskIm5cawcqgwkTSoRgRY4DYgipIr1ISgpw== - dependencies: - "@metamask/base-controller" "^4.0.1" - "@metamask/controller-utils" "^8.0.1" - "@metamask/json-rpc-engine" "^7.3.1" - "@metamask/rpc-errors" "^6.1.0" - "@metamask/utils" "^8.2.0" - "@types/deep-freeze-strict" "^1.1.0" - deep-freeze-strict "^1.1.1" - immer "^9.0.6" - nanoid "^3.1.31" - -"@metamask/permission-controller@^8.0.0": +"@metamask/permission-controller@8.0.0", "@metamask/permission-controller@^8.0.0": version "8.0.0" resolved "https://registry.yarnpkg.com/@metamask/permission-controller/-/permission-controller-8.0.0.tgz#2f358e9793cab5f047cb536906b6b0a71c93d107" integrity sha512-VwrkxKnvUSrpQeqljC/okrJG47tuLKkNrfmaj1SJ9S6/TUQjeRpsE0abKRt6pprTCbDpzJdyspexZq2aWykGLQ== @@ -4294,6 +4279,21 @@ immer "^9.0.6" nanoid "^3.1.31" +"@metamask/permission-controller@^7.1.0": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@metamask/permission-controller/-/permission-controller-7.1.0.tgz#e6a2e6c66e8b1c4a46a59eac6fdbdc20d0d7d19d" + integrity sha512-CrE+TU1MQSMgQJ3PDV3KsDD+mhRr+KQ40/XNL/Vk3ShKHqOkCpZLskIm5cawcqgwkTSoRgRY4DYgipIr1ISgpw== + dependencies: + "@metamask/base-controller" "^4.0.1" + "@metamask/controller-utils" "^8.0.1" + "@metamask/json-rpc-engine" "^7.3.1" + "@metamask/rpc-errors" "^6.1.0" + "@metamask/utils" "^8.2.0" + "@types/deep-freeze-strict" "^1.1.0" + deep-freeze-strict "^1.1.1" + immer "^9.0.6" + nanoid "^3.1.31" + "@metamask/phishing-controller@^8.0.0", "@metamask/phishing-controller@^8.0.2": version "8.0.2" resolved "https://registry.yarnpkg.com/@metamask/phishing-controller/-/phishing-controller-8.0.2.tgz#612d2d2d0d5e8746289fda036b0382a63ea82ffb" From 907fe798e2aacc75940ee31b932c4c93e08e32bb Mon Sep 17 00:00:00 2001 From: Frank von Hoven <141057783+frankvonhoven@users.noreply.github.com> Date: Mon, 6 May 2024 13:54:26 -0500 Subject: [PATCH 3/4] fix: revert podfile lock --- ios/Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 56b9f77ab69..5b9ca46ccfd 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1028,7 +1028,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Base64: cecfb41a004124895a7bcee567a89bae5a89d49b - boost: 57d2868c099736d80fcd648bf211b4431e51a558 + boost: 7dcd2de282d72e344012f7d6564d024930a6a440 Branch: 4ac024cb3c29b0ef628048694db3c4cfa679beb0 BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 From b1b0dd8f48628e72fa9b1c7acbbd1406fab9ecfb Mon Sep 17 00:00:00 2001 From: Frank von Hoven <141057783+frankvonhoven@users.noreply.github.com> Date: Tue, 7 May 2024 09:26:01 -0500 Subject: [PATCH 4/4] fix: yarn --- yarn.lock | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/yarn.lock b/yarn.lock index faa9283a5c7..d5b722ed227 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4241,34 +4241,7 @@ "@metamask/safe-event-emitter" "^2.0.0" through2 "^2.0.3" -<<<<<<< HEAD -"@metamask/obs-store@^8.1.0": - version "8.1.0" - resolved "https://registry.yarnpkg.com/@metamask/obs-store/-/obs-store-8.1.0.tgz#15a9e2f059104362b1b4c9a265c0730d3b3e83c7" - integrity sha512-MBi8UwzWoCQXVMLp7iOCppU9grSqbjshckNryUidx6Ozx1LJH6gNBmqayXLKjPqwNcsPajyh76PMKWYKBYNy2A== - dependencies: - "@metamask/safe-event-emitter" "^2.0.0" - through2 "^2.0.3" - "@metamask/permission-controller@8.0.0", "@metamask/permission-controller@^8.0.0": -======= -"@metamask/permission-controller@7.1.0", "@metamask/permission-controller@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@metamask/permission-controller/-/permission-controller-7.1.0.tgz#e6a2e6c66e8b1c4a46a59eac6fdbdc20d0d7d19d" - integrity sha512-CrE+TU1MQSMgQJ3PDV3KsDD+mhRr+KQ40/XNL/Vk3ShKHqOkCpZLskIm5cawcqgwkTSoRgRY4DYgipIr1ISgpw== - dependencies: - "@metamask/base-controller" "^4.0.1" - "@metamask/controller-utils" "^8.0.1" - "@metamask/json-rpc-engine" "^7.3.1" - "@metamask/rpc-errors" "^6.1.0" - "@metamask/utils" "^8.2.0" - "@types/deep-freeze-strict" "^1.1.0" - deep-freeze-strict "^1.1.1" - immer "^9.0.6" - nanoid "^3.1.31" - -"@metamask/permission-controller@^8.0.0": ->>>>>>> main version "8.0.0" resolved "https://registry.yarnpkg.com/@metamask/permission-controller/-/permission-controller-8.0.0.tgz#2f358e9793cab5f047cb536906b6b0a71c93d107" integrity sha512-VwrkxKnvUSrpQeqljC/okrJG47tuLKkNrfmaj1SJ9S6/TUQjeRpsE0abKRt6pprTCbDpzJdyspexZq2aWykGLQ==