Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Update signature controller v13 #9625

Merged
merged 6 commits into from
May 16, 2024
Merged

feat: Update signature controller v13 #9625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
57e59dd
feat: update signature controller to v13
MarioAslau May 14, 2024
62f33d7
Merge branch 'main' into feat/update-signature-controllerv13
MarioAslau May 14, 2024
cc96a60
Merge branch 'main' into feat/update-signature-controllerv13
legobeat May 15, 2024
7a57f5a
Merge branch 'main' into feat/update-signature-controllerv13
MarioAslau May 15, 2024
efd1020
remove unused ts expect error
tommasini May 15, 2024
5acee4e
Merge branch 'main' into feat/update-signature-controllerv13
MarioAslau May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/core/Engine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,7 +1194,6 @@ class Engine {
approvalController,
permissionController,
new SignatureController({
// @ts-expect-error TODO: Resolve/patch mismatch between base-controller versions. Before: never, never. Now: string, string, which expects 3rd and 4th args to be informed for restrictedControllerMessengers
messenger: this.controllerMessenger.getRestricted<
'SignatureController',
| 'ApprovalController:addRequest'
Expand Down
12 changes: 2 additions & 10 deletions ios/MetaMask.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1487,11 +1487,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
"-Wl",
"-ld_classic",
);
OTHER_LDFLAGS = "$(inherited)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
};
Expand Down Expand Up @@ -1533,11 +1529,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
OTHER_LDFLAGS = (
"$(inherited)",
"-Wl",
"-ld_classic",
);
OTHER_LDFLAGS = "$(inherited)";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
Expand Down
2 changes: 1 addition & 1 deletion ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,7 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
Base64: cecfb41a004124895a7bcee567a89bae5a89d49b
boost: 7dcd2de282d72e344012f7d6564d024930a6a440
boost: 57d2868c099736d80fcd648bf211b4431e51a558
Branch: 4ac024cb3c29b0ef628048694db3c4cfa679beb0
BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
"@metamask/rpc-errors": "^6.2.1",
"@metamask/scure-bip39": "^2.1.0",
"@metamask/sdk-communication-layer": "^0.20.2",
"@metamask/signature-controller": "6.1.3",
"@metamask/signature-controller": "^13.0.0",
"@metamask/slip44": "3.1.0",
"@metamask/smart-transactions-controller": "10.0.0",
"@metamask/snaps-controllers": "^5.0.0",
Expand Down
42 changes: 16 additions & 26 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3653,7 +3653,7 @@
immer "^9.0.6"
nanoid "^3.1.31"

"@metamask/approval-controller@^4.0.1", "@metamask/approval-controller@^4.1.0":
"@metamask/approval-controller@^4.1.0":
version "4.1.0"
resolved "https://registry.yarnpkg.com/@metamask/approval-controller/-/approval-controller-4.1.0.tgz#99bf137597d0392c5eebb784c0d43f2f40584e9d"
integrity sha512-UdSf8787NMADvmGqC88y8GbzwljdWw4cDCs4NWfc1HIhG4mvvaAFZwjZpPvU59DuFG6WycNfNLyJ7lcJsiYCYg==
Expand All @@ -3664,7 +3664,7 @@
immer "^9.0.6"
nanoid "^3.1.31"

"@metamask/approval-controller@^5.1.2":
"@metamask/approval-controller@^5.1.2", "@metamask/approval-controller@^5.1.3":
version "5.1.3"
resolved "https://registry.yarnpkg.com/@metamask/approval-controller/-/approval-controller-5.1.3.tgz#19e04b559df12cb078dcafabdb2f0aa8a5e73a45"
integrity sha512-RebVeTCrNePzXKTe+YcLlqWeKP5ADpWdIINOoP+IP8+AAWwzBJiHXXJ/4AxSBrIC4la+a0Xnohd+ou27bzfDDg==
Expand Down Expand Up @@ -4249,16 +4249,7 @@
ethereumjs-wallet "^1.0.1"
immer "^9.0.6"

"@metamask/logging-controller@^1.0.4":
version "1.0.4"
resolved "https://registry.yarnpkg.com/@metamask/logging-controller/-/logging-controller-1.0.4.tgz#78046f9ec70840fc6d8b96ab18a66b69a42f635f"
integrity sha512-L5Ruq3fD5PnDEQmg2+3B2zrzpZr0zrdNvTqA95i4/cQi8KP+zL9Xf2bFd0fBam8tda5lrkpVK7l/tEV2tF3GkA==
dependencies:
"@metamask/base-controller" "^3.2.3"
"@metamask/controller-utils" "^5.0.2"
uuid "^8.3.2"

"@metamask/logging-controller@^2.0.0":
"@metamask/logging-controller@^2.0.0", "@metamask/logging-controller@^2.0.3":
version "2.0.3"
resolved "https://registry.yarnpkg.com/@metamask/logging-controller/-/logging-controller-2.0.3.tgz#bedd17902fc6ffc1c9c703e3156827866753710b"
integrity sha512-3wA65IaE/jPLnqxoFtoQhllNIH31AtU8K3IlcsUqfDRPG6faVUj7I+pEKPVjdYGN90rWnzO6Axx/90FGQtUi6Q==
Expand All @@ -4267,7 +4258,7 @@
"@metamask/controller-utils" "^8.0.4"
uuid "^8.3.2"

"@metamask/message-manager@^7.3.5", "@metamask/message-manager@^7.3.9":
"@metamask/message-manager@^7.3.9":
version "7.3.9"
resolved "https://registry.yarnpkg.com/@metamask/message-manager/-/message-manager-7.3.9.tgz#4d416998bbdda30d80ebbb50b5efc7475b816ec9"
integrity sha512-B0+Qa1bPGMuVdBDaq8zcAKkRXWAt1CYAXW2NXzfO85a2ePFCUIrIhF9W8LflatXDXqesE5Y8Dij0sHGmsUfF8w==
Expand Down Expand Up @@ -4675,20 +4666,19 @@
utf-8-validate "^6.0.3"
uuid "^8.3.2"

"@metamask/signature-controller@6.1.3":
version "6.1.3"
resolved "https://registry.yarnpkg.com/@metamask/signature-controller/-/signature-controller-6.1.3.tgz#e24914d0589873f01e6d0ba198e98aa222aa6ae1"
integrity sha512-0mOTD/Ba/bxCSnrMR5SifklgB+Rz4TfTTQtU+0KYOel5Q2dDkZEB1A96iXC5gH+PZ7bK7wJWq/zjUmsIuRtHmQ==
"@metamask/signature-controller@^13.0.0":
version "13.0.0"
resolved "https://registry.yarnpkg.com/@metamask/signature-controller/-/signature-controller-13.0.0.tgz#17aff5e8bcf707aed33d3ba6ffd616be1b77b100"
integrity sha512-p7dr3wTtoTmQsOtPVNXC0cAUuco9TfCOtsMINvW7nppmeC0c1qRygh3dkPvfUsK4LPzLkZnFIaw6bUrHqGL9Qw==
dependencies:
"@metamask/approval-controller" "^4.0.1"
"@metamask/base-controller" "^3.2.3"
"@metamask/controller-utils" "^5.0.2"
"@metamask/logging-controller" "^1.0.4"
"@metamask/message-manager" "^7.3.5"
"@metamask/rpc-errors" "^6.1.0"
"@metamask/utils" "^8.1.0"
ethereumjs-util "^7.0.10"
immer "^9.0.6"
"@metamask/approval-controller" "^5.1.3"
"@metamask/base-controller" "^4.1.1"
"@metamask/controller-utils" "^8.0.4"
"@metamask/keyring-controller" "^13.0.0"
"@metamask/logging-controller" "^2.0.3"
"@metamask/message-manager" "^7.3.9"
"@metamask/rpc-errors" "^6.2.1"
"@metamask/utils" "^8.3.0"
lodash "^4.17.21"

"@metamask/slip44@3.1.0", "@metamask/slip44@^3.1.0":
Expand Down
Loading