Skip to content

Commit 2d5a239

Browse files
committed
feat(identity): bump profile-sync-controller to enable automatic pairing of seedless onboarding profiles
see MetaMask/core#6048 Signed-off-by: Mircea Nistor <mirceanis@gmail.com>
1 parent 1ef2bdf commit 2d5a239

File tree

5 files changed

+53
-63
lines changed

5 files changed

+53
-63
lines changed

app/scripts/controller-init/identity/authentication-controller-init.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ import {
22
AuthenticationControllerState,
33
Controller as AuthenticationController,
44
} from '@metamask/profile-sync-controller/auth';
5-
import { Platform } from '@metamask/profile-sync-controller/sdk';
5+
import { Env, Platform } from '@metamask/profile-sync-controller/sdk';
66
import { ControllerInitFunction } from '../types';
77
import { AuthenticationControllerMessenger } from '../messengers/identity';
8+
import { isProduction } from '../../../../shared/modules/environment';
89

910
/**
1011
* Initialize the Authentication controller.
@@ -20,6 +21,9 @@ export const AuthenticationControllerInit: ControllerInitFunction<
2021
AuthenticationControllerMessenger
2122
> = ({ controllerMessenger, persistedState, getMetaMetricsId }) => {
2223
const controller = new AuthenticationController({
24+
config: {
25+
env: isProduction() ? Env.PRD : Env.DEV,
26+
},
2327
messenger: controllerMessenger,
2428
state:
2529
persistedState.AuthenticationController as AuthenticationControllerState,

app/scripts/controller-init/identity/user-storage-controller-init.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import {
2+
Controller as UserStorageController,
23
UserStorageControllerMessenger,
34
UserStorageControllerState,
4-
Controller as UserStorageController,
55
} from '@metamask/profile-sync-controller/user-storage';
66
import { captureException } from '@sentry/browser';
7+
import { Env } from '@metamask/profile-sync-controller/sdk';
78
import { ControllerInitFunction } from '../types';
89
import { isProduction } from '../../../../shared/modules/environment';
910
import {
@@ -31,6 +32,7 @@ export const UserStorageControllerInit: ControllerInitFunction<
3132
// @ts-expect-error Controller uses string for names rather than enum
3233
trace,
3334
config: {
35+
env: isProduction() ? Env.PRD : Env.DEV,
3436
accountSyncing: {
3537
maxNumberOfAccountsToAdd: isProduction() ? undefined : 100,
3638
onAccountAdded: (profileId) => {

app/scripts/controller-init/messengers/identity/authentication-controller-messenger.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@ import {
44
KeyringControllerLockEvent,
55
KeyringControllerUnlockEvent,
66
} from '@metamask/keyring-controller';
7+
import { SeedlessOnboardingControllerGetStateAction } from '@metamask/seedless-onboarding-controller';
78
import { HandleSnapRequest } from '@metamask/snaps-controllers';
89

9-
type MessengerActions = KeyringControllerGetStateAction | HandleSnapRequest;
10+
type MessengerActions =
11+
| KeyringControllerGetStateAction
12+
| HandleSnapRequest
13+
| SeedlessOnboardingControllerGetStateAction;
1014

1115
type MessengerEvents =
1216
| KeyringControllerLockEvent
@@ -31,6 +35,7 @@ export function getAuthenticationControllerMessenger(
3135
allowedActions: [
3236
'KeyringController:getState',
3337
'SnapController:handleRequest',
38+
'SeedlessOnboardingController:getState',
3439
],
3540
allowedEvents: ['KeyringController:lock', 'KeyringController:unlock'],
3641
});

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@
129129
"attributions:generate": "./development/generate-attributions.sh"
130130
},
131131
"resolutions": {
132+
"@metamask/profile-sync-controller": "npm:@metamask-previews/profile-sync-controller@21.0.0-preview-91d59c3",
132133
"http-cache-semantics": "^4.1.1",
133134
"semver-regex": "^3.1.4",
134135
"base-x@^3.0.x": "^3.0.11",

yarn.lock

Lines changed: 38 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -6765,11 +6765,11 @@ __metadata:
67656765
linkType: hard
67666766

67676767
"@metamask/network-controller@npm:^23.5.0":
6768-
version: 23.5.1
6769-
resolution: "@metamask/network-controller@npm:23.5.1"
6768+
version: 23.6.0
6769+
resolution: "@metamask/network-controller@npm:23.6.0"
67706770
dependencies:
67716771
"@metamask/base-controller": "npm:^8.0.1"
6772-
"@metamask/controller-utils": "npm:^11.9.0"
6772+
"@metamask/controller-utils": "npm:^11.10.0"
67736773
"@metamask/error-reporting-service": "npm:^1.0.0"
67746774
"@metamask/eth-block-tracker": "npm:^12.0.1"
67756775
"@metamask/eth-json-rpc-infura": "npm:^10.2.0"
@@ -6787,7 +6787,7 @@ __metadata:
67876787
reselect: "npm:^5.1.1"
67886788
uri-js: "npm:^4.4.1"
67896789
uuid: "npm:^8.3.2"
6790-
checksum: 10/4e1b8d33f74369043efa78a7ed6b9088fd5c1b6e24263f26f9d811242b30a7b9a6688676dba2130ac1f4ac3c8f8abcdf05eb45bd07591f6ade4b335559460a5e
6790+
checksum: 10/38af2e1082a6f5a208ad96bc0b3c2c37b2853d621a1806e91d2663366c21092fc0e0ac6603489e874ec0501705ae180a6017715ff393f9b0be58c0380e735de3
67916791
languageName: node
67926792
linkType: hard
67936793

@@ -7073,9 +7073,9 @@ __metadata:
70737073
languageName: node
70747074
linkType: hard
70757075

7076-
"@metamask/profile-sync-controller@npm:^21.0.0":
7077-
version: 21.0.0
7078-
resolution: "@metamask/profile-sync-controller@npm:21.0.0"
7076+
"@metamask/profile-sync-controller@npm:@metamask-previews/profile-sync-controller@21.0.0-preview-91d59c3":
7077+
version: 21.0.0-preview-91d59c3
7078+
resolution: "@metamask-previews/profile-sync-controller@npm:21.0.0-preview-91d59c3"
70797079
dependencies:
70807080
"@metamask/base-controller": "npm:^8.0.1"
70817081
"@metamask/snaps-sdk": "npm:^9.0.0"
@@ -7089,9 +7089,10 @@ __metadata:
70897089
"@metamask/accounts-controller": ^31.0.0
70907090
"@metamask/keyring-controller": ^22.0.0
70917091
"@metamask/providers": ^22.0.0
7092+
"@metamask/seedless-onboarding-controller": ^2.1.0
70927093
"@metamask/snaps-controllers": ^14.0.0
70937094
webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
7094-
checksum: 10/4e599cca3b7999c517b906b51cf30470dec9349aa35a94a3a4a5f3847cd6c5bcbb176e8e3b2eeb8ef0ae6b26097920571e9bea8965006d757e9ef2b6898cf671
7095+
checksum: 10/4fb18215ad06ef6a2676835ee4c8ad2093e176c4ec674f7e5f8f16a5423225df827c291c260df92d3a0090363885142650c9b934b45a657727a104d9c2e632fe
70957096
languageName: node
70967097
linkType: hard
70977098

@@ -9728,9 +9729,9 @@ __metadata:
97289729
linkType: hard
97299730

97309731
"@sentry/core@npm:^9.10.0":
9731-
version: 9.30.0
9732-
resolution: "@sentry/core@npm:9.30.0"
9733-
checksum: 10/2957927aaae6ffafe7f6fffa8bc43631e10d584192fd679ba35b2527ed4f03364f8bebbc0f9a988e3cdb16f67d9fb23f244a796c7851961476270e0ec1dfd57e
9732+
version: 9.29.0
9733+
resolution: "@sentry/core@npm:9.29.0"
9734+
checksum: 10/87b52eedf8ba13e1d0f3d93f990e01c85432d873f854075b54198a14ff998ef63b46ff8e073deb98905b342daa6c252e13f9c68fa3e887ff2ee71c3fb404a60d
97349735
languageName: node
97359736
linkType: hard
97369737

@@ -14120,7 +14121,16 @@ __metadata:
1412014121
languageName: node
1412114122
linkType: hard
1412214123

14123-
"@types/imagemin@npm:*, @types/imagemin@npm:^8":
14124+
"@types/imagemin@npm:*":
14125+
version: 9.0.1
14126+
resolution: "@types/imagemin@npm:9.0.1"
14127+
dependencies:
14128+
"@types/node": "npm:*"
14129+
checksum: 10/7aeb27f13557dcfed24a39ee7526ce0bd054479ef783c6c705445db73bb323b9e61c1726e8620c3b653228222fb10a837b844ea8afcefbb2814f7c426ef8caf3
14130+
languageName: node
14131+
linkType: hard
14132+
14133+
"@types/imagemin@npm:^8":
1412414134
version: 8.0.5
1412514135
resolution: "@types/imagemin@npm:8.0.5"
1412614136
dependencies:
@@ -20232,19 +20242,7 @@ __metadata:
2023220242
languageName: node
2023320243
linkType: hard
2023420244

20235-
"create-hash@npm:~1.1.3":
20236-
version: 1.1.3
20237-
resolution: "create-hash@npm:1.1.3"
20238-
dependencies:
20239-
cipher-base: "npm:^1.0.1"
20240-
inherits: "npm:^2.0.1"
20241-
ripemd160: "npm:^2.0.0"
20242-
sha.js: "npm:^2.4.0"
20243-
checksum: 10/b9f675719321dd3a3c3540bb46afcbdaf7182366ce93da9265318290e928be881e5edeff8c48a5ee9263c342e5e3f705fad5eb48f2e2cddc5fed1eb54077e076
20244-
languageName: node
20245-
linkType: hard
20246-
20247-
"create-hmac@npm:^1.1.7":
20245+
"create-hmac@npm:^1.1.4, create-hmac@npm:^1.1.7":
2024820246
version: 1.1.7
2024920247
resolution: "create-hmac@npm:1.1.7"
2025020248
dependencies:
@@ -26552,15 +26550,6 @@ __metadata:
2655226550
languageName: node
2655326551
linkType: hard
2655426552

26555-
"hash-base@npm:^2.0.0":
26556-
version: 2.0.2
26557-
resolution: "hash-base@npm:2.0.2"
26558-
dependencies:
26559-
inherits: "npm:^2.0.1"
26560-
checksum: 10/e39f3f2bb91679ed350bd2eb81035acb1e1e6e9bb86d9f1197fcfdc3cf39a2c56bf82a1870f000fae651477883b4c107fd6ac0c640a18ab06298b87c39939396
26561-
languageName: node
26562-
linkType: hard
26563-
2656426553
"hash-base@npm:^3.0.0":
2656526554
version: 3.1.0
2656626555
resolution: "hash-base@npm:3.1.0"
@@ -26932,9 +26921,9 @@ __metadata:
2693226921
linkType: hard
2693326922

2693426923
"http-cache-semantics@npm:^4.1.1":
26935-
version: 4.2.0
26936-
resolution: "http-cache-semantics@npm:4.2.0"
26937-
checksum: 10/4efd2dfcfeea9d5e88c84af450b9980be8a43c2c8179508b1c57c7b4421c855f3e8efe92fa53e0b3f4a43c85824ada930eabbc306d1b3beab750b6dcc5187693
26924+
version: 4.1.1
26925+
resolution: "http-cache-semantics@npm:4.1.1"
26926+
checksum: 10/362d5ed66b12ceb9c0a328fb31200b590ab1b02f4a254a697dc796850cc4385603e75f53ec59f768b2dad3bfa1464bd229f7de278d2899a0e3beffc634b6683f
2693826927
languageName: node
2693926928
linkType: hard
2694026929

@@ -27259,9 +27248,9 @@ __metadata:
2725927248
linkType: hard
2726027249

2726127250
"ignore@npm:^5.1.1, ignore@npm:^5.1.8, ignore@npm:^5.2.0, ignore@npm:^5.2.4, ignore@npm:^5.3.1":
27262-
version: 5.3.2
27263-
resolution: "ignore@npm:5.3.2"
27264-
checksum: 10/cceb6a457000f8f6a50e1196429750d782afce5680dd878aa4221bd79972d68b3a55b4b1458fc682be978f4d3c6a249046aa0880637367216444ab7b014cfc98
27251+
version: 5.3.1
27252+
resolution: "ignore@npm:5.3.1"
27253+
checksum: 10/0a884c2fbc8c316f0b9f92beaf84464253b73230a4d4d286697be45fca081199191ca33e1c2e82d9e5f851f5e9a48a78e25a35c951e7eb41e59f150db3530065
2726527254
languageName: node
2726627255
linkType: hard
2726727256

@@ -35207,16 +35196,15 @@ __metadata:
3520735196
linkType: hard
3520835197

3520935198
"pbkdf2@npm:^3.0.17, pbkdf2@npm:^3.1.2":
35210-
version: 3.1.3
35211-
resolution: "pbkdf2@npm:3.1.3"
35199+
version: 3.1.2
35200+
resolution: "pbkdf2@npm:3.1.2"
3521235201
dependencies:
35213-
create-hash: "npm:~1.1.3"
35214-
create-hmac: "npm:^1.1.7"
35215-
ripemd160: "npm:=2.0.1"
35216-
safe-buffer: "npm:^5.2.1"
35217-
sha.js: "npm:^2.4.11"
35218-
to-buffer: "npm:^1.2.0"
35219-
checksum: 10/980cf2977aa84ec3166fde195a28464ab494131c0a5778fc8f20b8894410747e502159c19ef2b41842c728bc52ba49ffee6847e3ee61ac0d482689f85d8a1b30
35202+
create-hash: "npm:^1.1.2"
35203+
create-hmac: "npm:^1.1.4"
35204+
ripemd160: "npm:^2.0.1"
35205+
safe-buffer: "npm:^5.0.1"
35206+
sha.js: "npm:^2.4.8"
35207+
checksum: 10/40bdf30df1c9bb1ae41ec50c11e480cf0d36484b7c7933bf55e4451d1d0e3f09589df70935c56e7fccc5702779a0d7b842d012be8c08a187b44eb24d55bb9460
3522035208
languageName: node
3522135209
linkType: hard
3522235210

@@ -38528,16 +38516,6 @@ __metadata:
3852838516
languageName: node
3852938517
linkType: hard
3853038518

38531-
"ripemd160@npm:=2.0.1":
38532-
version: 2.0.1
38533-
resolution: "ripemd160@npm:2.0.1"
38534-
dependencies:
38535-
hash-base: "npm:^2.0.0"
38536-
inherits: "npm:^2.0.1"
38537-
checksum: 10/f1a20b72b3ef897a981544c72a1fe15c2bd580f6f40e3062f7839af8e81232f746aa860964686e4b81e90929ad086f14823a9864e4e4bed3367e597fe14a0968
38538-
languageName: node
38539-
linkType: hard
38540-
3854138519
"ripemd160@npm:^2.0.0, ripemd160@npm:^2.0.1, ripemd160@npm:^2.0.2":
3854238520
version: 2.0.2
3854338521
resolution: "ripemd160@npm:2.0.2"
@@ -41776,7 +41754,7 @@ __metadata:
4177641754
languageName: node
4177741755
linkType: hard
4177841756

41779-
"to-buffer@npm:^1.1.1, to-buffer@npm:^1.2.0":
41757+
"to-buffer@npm:^1.1.1":
4178041758
version: 1.2.1
4178141759
resolution: "to-buffer@npm:1.2.1"
4178241760
dependencies:

0 commit comments

Comments
 (0)