fix: fix merge conflicts

MetaMask · Oct 23, 2024 · d14134c · d14134c
2 parents d5f1d33 + d6c52fe
commit d14134c
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 421 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-20.12.2
+20.14.0
diff --git a/app/core/Engine.ts b/app/core/Engine.ts
@@ -506,7 +506,6 @@ class Engine {
     };
 
     const approvalController = new ApprovalController({
-      // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
       messenger: this.controllerMessenger.getRestricted({
         name: 'ApprovalController',
         allowedEvents: [],

diff --git a/app/util/test/initial-background-state.json b/app/util/test/initial-background-state.json
@@ -320,6 +320,7 @@
     "domains": {}
   },
   "SignatureController": {
+    "signatureRequests": {},
     "unapprovedPersonalMsgs": {},
     "unapprovedTypedMessages": {},
     "unapprovedPersonalMsgCount": 0,

diff --git a/bitrise.yml b/bitrise.yml
@@ -1553,7 +1553,7 @@ app:
       NVM_SHA256SUM: '8e45fa547f428e9196a5613efad3bfa4d4608b74ca870f930090598f5af5f643'
     - opts:
         is_expand: false
-      NODE_VERSION: 20.12.2
+      NODE_VERSION: 20.14.0
     - opts:
         is_expand: false
       YARN_VERSION: 1.22.22

diff --git a/package.json b/package.json
@@ -141,7 +141,7 @@
     "@ledgerhq/react-native-hw-transport-ble": "^6.33.2",
     "@metamask/accounts-controller": "^18.2.1",
     "@metamask/address-book-controller": "^6.0.1",
-    "@metamask/approval-controller": "^7.0.1",
+    "@metamask/approval-controller": "^7.1.0",
     "@metamask/assets-controllers": "^36.0.0",
     "@metamask/base-controller": "^7.0.1",
     "@metamask/composable-controller": "^3.0.0",
@@ -179,7 +179,7 @@
     "@metamask/scure-bip39": "^2.1.0",
     "@metamask/sdk-communication-layer": "0.29.0-wallet",
     "@metamask/selected-network-controller": "^15.0.2",
-    "@metamask/signature-controller": "^19.1.0",
+    "@metamask/signature-controller": "^20.1.0",
     "@metamask/slip44": "3.1.0",
     "@metamask/smart-transactions-controller": "^13.0.0",
     "@metamask/snaps-controllers": "^9.8.0",
@@ -532,7 +532,7 @@
     "fs": "react-native-level-fs"
   },
   "engines": {
-    "node": "^20.12.2",
+    "node": "^20.14.0",
     "yarn": "^1.22.22"
   },
   "lavamoat": {

diff --git a/patches/@metamask+approval-controller+7.0.2.patch b/patches/@metamask+approval-controller+7.0.2.patch
diff --git a/scripts/generate-attributions/package.json b/scripts/generate-attributions/package.json
@@ -12,7 +12,7 @@
     "@metamask/oss-attribution-generator": "^2.0.2"
   },
   "engines": {
-    "node": "^20.12.2",
+    "node": "^20.14.0",
     "yarn": "^1.22.0"
   },
   "lavamoat": {

diff --git a/yarn.lock b/yarn.lock
@@ -4320,12 +4320,12 @@
     "@metamask/controller-utils" "^11.3.0"
     "@metamask/utils" "^9.1.0"
 
-"@metamask/approval-controller@^7.0.0", "@metamask/approval-controller@^7.0.1", "@metamask/approval-controller@^7.0.2":
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/@metamask/approval-controller/-/approval-controller-7.0.2.tgz#bf46090fb900a5687b93978fb93eb3cf61d39a56"
-  integrity sha512-cjCXpdxQ1IzmNrfTtw0MpYcBDklzvWcyRz5AutvlBaLafrWh2FDQZFvofd/rO49DdrvAxEQHUt6GXE9aFjCFTQ==
+"@metamask/approval-controller@^7.0.0", "@metamask/approval-controller@^7.0.1", "@metamask/approval-controller@^7.0.2", "@metamask/approval-controller@^7.1.0":
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/@metamask/approval-controller/-/approval-controller-7.1.0.tgz#34b07bc4eaf6938b15f9d915c6885d4a5c0a5205"
+  integrity sha512-dhqUeX8wMzW88U+Vgr7oKf0Vouol10ncB3lxmvWyC1VZJhSOdO3VUkn0tH1lzt3ybxYVMOkPaB3gfdksfnNRyA==
   dependencies:
-    "@metamask/base-controller" "^6.0.2"
+    "@metamask/base-controller" "^7.0.1"
     "@metamask/rpc-errors" "^6.3.1"
     "@metamask/utils" "^9.1.0"
     nanoid "^3.1.31"
@@ -4642,6 +4642,18 @@
     ethereum-cryptography "^2.1.2"
     tweetnacl "^1.0.3"
 
+"@metamask/eth-sig-util@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@metamask/eth-sig-util/-/eth-sig-util-8.0.0.tgz#6310d93cd1101cab3cc6bc2a1ff526290ed2695b"
+  integrity sha512-IwE6aoxUL39IhmsAgE4nk+OZbNo+ThFZRNsUjE1pjdEa4MFpWzm1Rue4zJ5DMy1oUyZBi/aiCLMhdMnjl2bh2Q==
+  dependencies:
+    "@ethereumjs/util" "^8.1.0"
+    "@metamask/abi-utils" "^2.0.4"
+    "@metamask/utils" "^9.0.0"
+    "@scure/base" "~1.1.3"
+    ethereum-cryptography "^2.1.2"
+    tweetnacl "^1.0.3"
+
 "@metamask/eth-simple-keyring@^6.0.5":
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/@metamask/eth-simple-keyring/-/eth-simple-keyring-6.0.5.tgz#3e2f783092f9d873740e43852880216192802290"
@@ -5336,16 +5348,18 @@
     "@metamask/swappable-obj-proxy" "^2.2.0"
     "@metamask/utils" "^8.3.0"
 
-"@metamask/signature-controller@^19.1.0":
-  version "19.1.0"
-  resolved "https://registry.yarnpkg.com/@metamask/signature-controller/-/signature-controller-19.1.0.tgz#47c7435f51d3273fb5a0373f4ebdcfccb6d490a9"
-  integrity sha512-1rDKxV7HYoKZjBbqkeWLk3TLJJcl8cRgAkPTG8jMRIp7eYW2vUxo5nsiaJlBBHDV/fbjR12SbiawMjj93zD2DA==
+"@metamask/signature-controller@^20.1.0":
+  version "20.1.0"
+  resolved "https://registry.yarnpkg.com/@metamask/signature-controller/-/signature-controller-20.1.0.tgz#b2ab41ec6eb191f9b21a74bf636d2b8e34d590e0"
+  integrity sha512-29pYdr9Q5YB5tGrYLEkpCh3l41W5Otg87cQ+cRf7Je0xGo34VdrIHNv6MJQcEgng5qTmR0tG3Hq23nPyZo8rSw==
   dependencies:
     "@metamask/base-controller" "^7.0.1"
     "@metamask/controller-utils" "^11.3.0"
-    "@metamask/message-manager" "^10.1.1"
+    "@metamask/eth-sig-util" "^8.0.0"
     "@metamask/utils" "^9.1.0"
+    jsonschema "^1.2.4"
     lodash "^4.17.21"
+    uuid "^8.3.2"
 
 "@metamask/slip44@3.1.0", "@metamask/slip44@^3.1.0":
   version "3.1.0"