Skip to content

Commit 622ab4a

Browse files
OGPoyrazOGPoyraz
committed
Merge branch 'main' into release/202.0.0
2 parents a882433 + 92e6472 commit 622ab4a

File tree

19 files changed

+837
-160
lines changed

19 files changed

+837
-160
lines changed

‎packages/accounts-controller/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444
"dependencies": {
4545
"@ethereumjs/util": "^8.1.0",
4646
"@metamask/base-controller": "^7.0.0",
47-
"@metamask/eth-snap-keyring": "^4.3.1",
47+
"@metamask/eth-snap-keyring": "^4.3.3",
4848
"@metamask/keyring-api": "^8.1.0",
49-
"@metamask/snaps-sdk": "^6.1.1",
50-
"@metamask/snaps-utils": "^7.8.1",
49+
"@metamask/snaps-sdk": "^6.5.0",
50+
"@metamask/snaps-utils": "^8.1.1",
5151
"@metamask/utils": "^9.1.0",
5252
"deepmerge": "^4.2.2",
5353
"ethereum-cryptography": "^2.1.2",
@@ -57,7 +57,7 @@
5757
"devDependencies": {
5858
"@metamask/auto-changelog": "^3.4.4",
5959
"@metamask/keyring-controller": "^17.2.0",
60-
"@metamask/snaps-controllers": "^9.3.1",
60+
"@metamask/snaps-controllers": "^9.7.0",
6161
"@types/jest": "^27.4.1",
6262
"@types/readable-stream": "^2.3.0",
6363
"jest": "^27.5.1",
@@ -68,7 +68,7 @@
6868
},
6969
"peerDependencies": {
7070
"@metamask/keyring-controller": "^17.0.0",
71-
"@metamask/snaps-controllers": "^9.3.0"
71+
"@metamask/snaps-controllers": "^9.7.0"
7272
},
7373
"engines": {
7474
"node": "^18.18 || >=20"

‎packages/chain-controller/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@
4545
"@metamask/base-controller": "^7.0.0",
4646
"@metamask/chain-api": "^0.1.0",
4747
"@metamask/keyring-api": "^8.1.0",
48-
"@metamask/snaps-controllers": "^9.3.1",
49-
"@metamask/snaps-sdk": "^6.1.1",
50-
"@metamask/snaps-utils": "^7.8.1",
48+
"@metamask/snaps-controllers": "^9.7.0",
49+
"@metamask/snaps-sdk": "^6.5.0",
50+
"@metamask/snaps-utils": "^8.1.1",
5151
"@metamask/utils": "^9.1.0",
5252
"uuid": "^8.3.2"
5353
},

‎packages/profile-sync-controller/package.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
},
7171
"dependencies": {
7272
"@metamask/base-controller": "^7.0.0",
73-
"@metamask/snaps-sdk": "^6.1.1",
74-
"@metamask/snaps-utils": "^7.8.1",
73+
"@metamask/snaps-sdk": "^6.5.0",
74+
"@metamask/snaps-utils": "^8.1.1",
7575
"@noble/ciphers": "^0.5.2",
7676
"@noble/hashes": "^1.4.0",
7777
"immer": "^9.0.6",
@@ -84,7 +84,8 @@
8484
"@metamask/auto-changelog": "^3.4.4",
8585
"@metamask/keyring-api": "^8.1.0",
8686
"@metamask/keyring-controller": "^17.2.0",
87-
"@metamask/snaps-controllers": "^9.3.1",
87+
"@metamask/network-controller": "^21.0.0",
88+
"@metamask/snaps-controllers": "^9.7.0",
8889
"@types/jest": "^27.4.1",
8990
"deepmerge": "^4.2.2",
9091
"ethers": "^6.12.0",
@@ -99,7 +100,7 @@
99100
"peerDependencies": {
100101
"@metamask/accounts-controller": "^18.1.1",
101102
"@metamask/keyring-controller": "^17.2.0",
102-
"@metamask/snaps-controllers": "^9.3.0"
103+
"@metamask/snaps-controllers": "^9.7.0"
103104
},
104105
"engines": {
105106
"node": "^18.18 || >=20"

‎packages/profile-sync-controller/src/controllers/user-storage/UserStorageController.test.ts‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ describe('user-storage/user-storage-controller - enableProfileSyncing() tests',
388388
});
389389

390390
describe('user-storage/user-storage-controller - syncInternalAccountsWithUserStorage() tests', () => {
391-
it('rejects if UserStorage is not enabled', async () => {
391+
it('returns void if UserStorage is not enabled', async () => {
392392
const arrangeMocks = async () => {
393393
return {
394394
messengerMocks: mockUserStorageMessenger(),
@@ -409,9 +409,9 @@ describe('user-storage/user-storage-controller - syncInternalAccountsWithUserSto
409409
},
410410
});
411411

412-
await expect(
413-
controller.syncInternalAccountsWithUserStorage(),
414-
).rejects.toThrow(expect.any(Error));
412+
await controller.syncInternalAccountsWithUserStorage();
413+
414+
expect(messengerMocks.mockAccountsListAccounts).not.toHaveBeenCalled();
415415
});
416416

417417
it('returns void if account syncing feature flag is disabled', async () => {
@@ -1083,7 +1083,7 @@ describe('user-storage/user-storage-controller - syncInternalAccountsWithUserSto
10831083
});
10841084

10851085
describe('user-storage/user-storage-controller - saveInternalAccountToUserStorage() tests', () => {
1086-
it('rejects if UserStorage is not enabled', async () => {
1086+
it('returns void if UserStorage is not enabled', async () => {
10871087
const arrangeMocks = async () => {
10881088
return {
10891089
messengerMocks: mockUserStorageMessenger(),
@@ -1103,11 +1103,13 @@ describe('user-storage/user-storage-controller - saveInternalAccountToUserStorag
11031103
},
11041104
});
11051105

1106-
await expect(
1107-
controller.saveInternalAccountToUserStorage(
1108-
MOCK_INTERNAL_ACCOUNTS.ONE[0].address,
1109-
),
1110-
).rejects.toThrow(expect.any(Error));
1106+
await controller.saveInternalAccountToUserStorage(
1107+
MOCK_INTERNAL_ACCOUNTS.ONE[0] as InternalAccount,
1108+
);
1109+
1110+
expect(
1111+
messengerMocks.mockAccountsGetAccountByAddress,
1112+
).not.toHaveBeenCalled();
11111113
});
11121114

11131115
it('returns void if account syncing feature flag is disabled', async () => {
@@ -1130,7 +1132,7 @@ describe('user-storage/user-storage-controller - saveInternalAccountToUserStorag
11301132
});
11311133

11321134
await controller.saveInternalAccountToUserStorage(
1133-
MOCK_INTERNAL_ACCOUNTS.ONE[0].address,
1135+
MOCK_INTERNAL_ACCOUNTS.ONE[0] as InternalAccount,
11341136
);
11351137

11361138
expect(mockAPI.isDone()).toBe(false);
@@ -1156,7 +1158,7 @@ describe('user-storage/user-storage-controller - saveInternalAccountToUserStorag
11561158
});
11571159

11581160
await controller.saveInternalAccountToUserStorage(
1159-
MOCK_INTERNAL_ACCOUNTS.ONE[0].address,
1161+
MOCK_INTERNAL_ACCOUNTS.ONE[0] as InternalAccount,
11601162
);
11611163

11621164
expect(mockAPI.isDone()).toBe(true);
@@ -1184,7 +1186,7 @@ describe('user-storage/user-storage-controller - saveInternalAccountToUserStorag
11841186

11851187
await expect(
11861188
controller.saveInternalAccountToUserStorage(
1187-
MOCK_INTERNAL_ACCOUNTS.ONE[0].address,
1189+
MOCK_INTERNAL_ACCOUNTS.ONE[0] as InternalAccount,
11881190
),
11891191
).rejects.toThrow(expect.any(Error));
11901192
});
@@ -1210,7 +1212,7 @@ describe('user-storage/user-storage-controller - saveInternalAccountToUserStorag
12101212
);
12111213

12121214
expect(mockSaveInternalAccountToUserStorage).toHaveBeenCalledWith(
1213-
MOCK_INTERNAL_ACCOUNTS.ONE[0].address,
1215+
MOCK_INTERNAL_ACCOUNTS.ONE[0],
12141216
);
12151217
});
12161218

@@ -1235,7 +1237,7 @@ describe('user-storage/user-storage-controller - saveInternalAccountToUserStorag
12351237
);
12361238

12371239
expect(mockSaveInternalAccountToUserStorage).toHaveBeenCalledWith(
1238-
MOCK_INTERNAL_ACCOUNTS.ONE[0].address,
1240+
MOCK_INTERNAL_ACCOUNTS.ONE[0],
12391241
);
12401242
});
12411243
});
@@ -1272,7 +1274,6 @@ function mockUserStorageMessenger(options?: {
12721274
'NotificationServicesController:selectIsNotificationServicesEnabled',
12731275
'AccountsController:listAccounts',
12741276
'AccountsController:updateAccountMetadata',
1275-
'AccountsController:getAccountByAddress',
12761277
'KeyringController:addNewAccount',
12771278
],
12781279
allowedEvents: [

0 commit comments

Comments
 (0)