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

patch: Update eth-snap-keyring to 2.1.1 #22330

Merged
merged 4 commits into from
Dec 19, 2023
Merged

patch: Update eth-snap-keyring to 2.1.1 #22330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f999f57
Update eth-snap-keyring to 2.1.1
owencraston Dec 18, 2023
2deeb93
run yarn dedupe
owencraston Dec 18, 2023
c759b57
migrate to snapId
owencraston Dec 18, 2023
5d1046f
Update LavaMoat policies
metamaskbot Dec 18, 2023
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
3 changes: 2 additions & 1 deletion app/scripts/lib/snap-keyring/snap-keyring.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import type { KeyringControllerGetAccountsAction } from '@metamask/keyring-contr
import browser from 'webextension-polyfill';
import { RestrictedControllerMessenger } from '@metamask/base-controller';
import { MaybeUpdateState, TestOrigin } from '@metamask/phishing-controller';
import { SnapId } from '@metamask/snaps-sdk';
import { SNAP_MANAGE_ACCOUNTS_CONFIRMATION_TYPES } from '../../../../shared/constants/app';
import { t } from '../../translate';
import MetamaskController from '../../metamask-controller';
Expand All @@ -28,7 +29,7 @@ import { isBlockedUrl } from './utils/isBlockedUrl';
*/
export const getAccountsBySnapId = async (
controller: MetamaskController,
snapId: string,
snapId: SnapId,
) => {
const snapKeyring: SnapKeyring = await controller.getSnapKeyring();
return await snapKeyring.getAccountsBySnapId(snapId);
Expand Down
9 changes: 8 additions & 1 deletion lavamoat/browserify/beta/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1064,14 +1064,21 @@
},
"packages": {
"@ethereumjs/tx": true,
"@metamask/eth-snap-keyring>@metamask/keyring-api": true,
"@metamask/eth-snap-keyring>uuid": true,
"@metamask/keyring-api": true,
"@metamask/message-manager>@metamask/eth-sig-util": true,
"@metamask/utils": true,
"superstruct": true,
"webpack>events": true
}
},
"@metamask/eth-snap-keyring>@metamask/keyring-api": {
"packages": {
"@metamask/eth-snap-keyring>uuid": true,
"@metamask/utils": true,
"superstruct": true
}
},
"@metamask/eth-snap-keyring>uuid": {
"globals": {
"crypto": true
Expand Down
9 changes: 8 additions & 1 deletion lavamoat/browserify/desktop/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,14 +1141,21 @@
},
"packages": {
"@ethereumjs/tx": true,
"@metamask/eth-snap-keyring>@metamask/keyring-api": true,
"@metamask/eth-snap-keyring>uuid": true,
"@metamask/keyring-api": true,
"@metamask/message-manager>@metamask/eth-sig-util": true,
"@metamask/utils": true,
"superstruct": true,
"webpack>events": true
}
},
"@metamask/eth-snap-keyring>@metamask/keyring-api": {
"packages": {
"@metamask/eth-snap-keyring>uuid": true,
"@metamask/utils": true,
"superstruct": true
}
},
"@metamask/eth-snap-keyring>uuid": {
"globals": {
"crypto": true
Expand Down
9 changes: 8 additions & 1 deletion lavamoat/browserify/flask/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,14 +1141,21 @@
},
"packages": {
"@ethereumjs/tx": true,
"@metamask/eth-snap-keyring>@metamask/keyring-api": true,
"@metamask/eth-snap-keyring>uuid": true,
"@metamask/keyring-api": true,
"@metamask/message-manager>@metamask/eth-sig-util": true,
"@metamask/utils": true,
"superstruct": true,
"webpack>events": true
}
},
"@metamask/eth-snap-keyring>@metamask/keyring-api": {
"packages": {
"@metamask/eth-snap-keyring>uuid": true,
"@metamask/utils": true,
"superstruct": true
}
},
"@metamask/eth-snap-keyring>uuid": {
"globals": {
"crypto": true
Expand Down
9 changes: 8 additions & 1 deletion lavamoat/browserify/main/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1064,14 +1064,21 @@
},
"packages": {
"@ethereumjs/tx": true,
"@metamask/eth-snap-keyring>@metamask/keyring-api": true,
"@metamask/eth-snap-keyring>uuid": true,
"@metamask/keyring-api": true,
"@metamask/message-manager>@metamask/eth-sig-util": true,
"@metamask/utils": true,
"superstruct": true,
"webpack>events": true
}
},
"@metamask/eth-snap-keyring>@metamask/keyring-api": {
"packages": {
"@metamask/eth-snap-keyring>uuid": true,
"@metamask/utils": true,
"superstruct": true
}
},
"@metamask/eth-snap-keyring>uuid": {
"globals": {
"crypto": true
Expand Down
9 changes: 8 additions & 1 deletion lavamoat/browserify/mmi/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,14 +1196,21 @@
},
"packages": {
"@ethereumjs/tx": true,
"@metamask/eth-snap-keyring>@metamask/keyring-api": true,
"@metamask/eth-snap-keyring>uuid": true,
"@metamask/keyring-api": true,
"@metamask/message-manager>@metamask/eth-sig-util": true,
"@metamask/utils": true,
"superstruct": true,
"webpack>events": true
}
},
"@metamask/eth-snap-keyring>@metamask/keyring-api": {
"packages": {
"@metamask/eth-snap-keyring>uuid": true,
"@metamask/utils": true,
"superstruct": true
}
},
"@metamask/eth-snap-keyring>uuid": {
"globals": {
"crypto": true
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 @@ -260,7 +260,7 @@
"@metamask/eth-keyring-controller": "^15.1.0",
"@metamask/eth-ledger-bridge-keyring": "^2.0.1",
"@metamask/eth-query": "^3.0.1",
"@metamask/eth-snap-keyring": "^2.0.0",
"@metamask/eth-snap-keyring": "^2.1.1",
"@metamask/eth-token-tracker": "^4.0.0",
"@metamask/eth-trezor-keyring": "^3.0.0",
"@metamask/etherscan-link": "^2.2.0",
Expand Down
37 changes: 27 additions & 10 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4202,19 +4202,20 @@ __metadata:
languageName: node
linkType: hard

"@metamask/eth-snap-keyring@npm:^2.0.0":
version: 2.0.0
resolution: "@metamask/eth-snap-keyring@npm:2.0.0"
"@metamask/eth-snap-keyring@npm:^2.0.0, @metamask/eth-snap-keyring@npm:^2.1.1":
version: 2.1.1
resolution: "@metamask/eth-snap-keyring@npm:2.1.1"
dependencies:
"@ethereumjs/tx": "npm:^4.2.0"
"@metamask/eth-sig-util": "npm:^7.0.0"
"@metamask/keyring-api": "npm:^1.0.0"
"@metamask/snaps-controllers": "npm:^3.0.0"
"@metamask/keyring-api": "npm:^2.0.0"
"@metamask/snaps-controllers": "npm:^3.4.1"
"@metamask/snaps-sdk": "npm:^1.2.0"
"@metamask/utils": "npm:^8.1.0"
"@types/uuid": "npm:^9.0.1"
superstruct: "npm:^1.0.3"
uuid: "npm:^9.0.0"
checksum: fede2a3c0b32ad7efb7eccd2795d1facb255930122a2bee49343669d8e54b34552925aff0908766bbd2d8d9d1e3a94b1921dbc77420f1130b080ec7c22bf6c73
checksum: 7958f5beedddee9d74b46ee91e214e0e4893ddc981b7d713f85037b3efddd3368954b946b21056f1bdde08aa93c0a088e848d21ba6f06c9d8643bd39cc29a2c2
languageName: node
linkType: hard

Expand Down Expand Up @@ -4375,6 +4376,22 @@ __metadata:
languageName: node
linkType: hard

"@metamask/keyring-api@npm:^2.0.0":
version: 2.0.0
resolution: "@metamask/keyring-api@npm:2.0.0"
dependencies:
"@metamask/providers": "npm:^14.0.1"
"@metamask/snaps-controllers": "npm:^3.4.1"
"@metamask/snaps-sdk": "npm:^1.2.0"
"@metamask/snaps-utils": "npm:^5.0.0"
"@metamask/utils": "npm:^8.1.0"
"@types/uuid": "npm:^9.0.1"
superstruct: "npm:^1.0.3"
uuid: "npm:^9.0.0"
checksum: 65dcca4d7f94102fafbccbb3ee79647f94f92985e8e3dab795fde5ee563fd3ff050ec59ee16c0276d06bb7d474a2281c504d2dc7cac60df3b2bfc918aa17615f
languageName: node
linkType: hard

"@metamask/keyring-controller@npm:9.0.0":
version: 9.0.0
resolution: "@metamask/keyring-controller@npm:9.0.0"
Expand Down Expand Up @@ -4803,7 +4820,7 @@ __metadata:
languageName: node
linkType: hard

"@metamask/providers@npm:^14.0.2":
"@metamask/providers@npm:^14.0.1, @metamask/providers@npm:^14.0.2":
version: 14.0.2
resolution: "@metamask/providers@npm:14.0.2"
dependencies:
Expand Down Expand Up @@ -4984,7 +5001,7 @@ __metadata:
languageName: node
linkType: hard

"@metamask/snaps-controllers@npm:^3.0.0, @metamask/snaps-controllers@npm:^3.5.1":
"@metamask/snaps-controllers@npm:^3.0.0, @metamask/snaps-controllers@npm:^3.4.1, @metamask/snaps-controllers@npm:^3.5.1":
version: 3.5.1
resolution: "@metamask/snaps-controllers@npm:3.5.1"
dependencies:
Expand Down Expand Up @@ -5113,7 +5130,7 @@ __metadata:
languageName: node
linkType: hard

"@metamask/snaps-utils@npm:^5.1.0":
"@metamask/snaps-utils@npm:^5.0.0, @metamask/snaps-utils@npm:^5.1.0":
version: 5.1.0
resolution: "@metamask/snaps-utils@npm:5.1.0"
dependencies:
Expand Down Expand Up @@ -24349,7 +24366,7 @@ __metadata:
"@metamask/eth-keyring-controller": "npm:^15.1.0"
"@metamask/eth-ledger-bridge-keyring": "npm:^2.0.1"
"@metamask/eth-query": "npm:^3.0.1"
"@metamask/eth-snap-keyring": "npm:^2.0.0"
"@metamask/eth-snap-keyring": "npm:^2.1.1"
"@metamask/eth-token-tracker": "npm:^4.0.0"
"@metamask/eth-trezor-keyring": "npm:^3.0.0"
"@metamask/etherscan-link": "npm:^2.2.0"
Expand Down
Loading