Skip to content

Commit e354ad5

Browse files
authored
chore: update accounts related packages (#27284)
## **Description** Updating packages to use versions coming from the new [accounts monorepo](https://github.com/MetaMask/accounts). [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/27284?quickstart=1) ## **Related issues** Related to: - MetaMask/accounts#39 - MetaMask/accounts#50 - MetaMask/accounts#54 - MetaMask/core#4713 - MetaMask/core#4734 - MetaMask/snap-simple-keyring#156 - MetaMask/snap-watch-only#52 - MetaMask/snap-bitcoin-wallet#255 - MetaMask/snap-account-abstraction-keyring#142 ## **Manual testing steps** Test parts of the extension that closely related to accounts management + HW wallets support. ## **Screenshots/Recordings** ### **Before** ### **After** ## **Pre-merge author checklist** - [x] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [x] I’ve included tests if applicable - [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.
1 parent ec698f8 commit e354ad5

File tree

7 files changed

+68
-109
lines changed

7 files changed

+68
-109
lines changed

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -297,14 +297,14 @@
297297
"@metamask-institutional/transaction-update": "^0.2.5",
298298
"@metamask-institutional/types": "^1.1.0",
299299
"@metamask/abi-utils": "^2.0.2",
300-
"@metamask/account-watcher": "^4.1.0",
301-
"@metamask/accounts-controller": "^18.2.1",
300+
"@metamask/account-watcher": "^4.1.1",
301+
"@metamask/accounts-controller": "^18.2.2",
302302
"@metamask/address-book-controller": "^6.0.0",
303303
"@metamask/announcement-controller": "^7.0.0",
304304
"@metamask/approval-controller": "^7.0.0",
305305
"@metamask/assets-controllers": "^37.0.0",
306306
"@metamask/base-controller": "^7.0.0",
307-
"@metamask/bitcoin-wallet-snap": "^0.6.0",
307+
"@metamask/bitcoin-wallet-snap": "^0.6.1",
308308
"@metamask/browser-passworder": "^4.3.0",
309309
"@metamask/contract-metadata": "^2.5.0",
310310
"@metamask/controller-utils": "^11.2.0",
@@ -316,17 +316,17 @@
316316
"@metamask/eth-ledger-bridge-keyring": "^3.0.1",
317317
"@metamask/eth-query": "^4.0.0",
318318
"@metamask/eth-sig-util": "^7.0.1",
319-
"@metamask/eth-snap-keyring": "^4.3.3",
319+
"@metamask/eth-snap-keyring": "^4.3.6",
320320
"@metamask/eth-token-tracker": "^8.0.0",
321-
"@metamask/eth-trezor-keyring": "^3.1.0",
321+
"@metamask/eth-trezor-keyring": "^3.1.3",
322322
"@metamask/etherscan-link": "^3.0.0",
323323
"@metamask/ethjs": "^0.6.0",
324324
"@metamask/ethjs-contract": "^0.4.1",
325325
"@metamask/ethjs-query": "^0.7.1",
326326
"@metamask/gas-fee-controller": "^18.0.0",
327327
"@metamask/jazzicon": "^2.0.0",
328-
"@metamask/keyring-api": "^8.1.0",
329-
"@metamask/keyring-controller": "^17.2.1",
328+
"@metamask/keyring-api": "^8.1.3",
329+
"@metamask/keyring-controller": "^17.2.2",
330330
"@metamask/logging-controller": "^6.0.0",
331331
"@metamask/logo": "^3.1.2",
332332
"@metamask/message-manager": "^10.1.0",
@@ -359,7 +359,7 @@
359359
"@metamask/snaps-rpc-methods": "^11.1.1",
360360
"@metamask/snaps-sdk": "^6.5.1",
361361
"@metamask/snaps-utils": "^8.1.1",
362-
"@metamask/transaction-controller": "^37.0.0",
362+
"@metamask/transaction-controller": "^37.1.0",
363363
"@metamask/user-operation-controller": "^13.0.0",
364364
"@metamask/utils": "^9.1.0",
365365
"@ngraveio/bc-ur": "^1.1.12",

test/data/mock-state.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -616,8 +616,8 @@
616616
"developer": "Metamask",
617617
"website": "https://www.consensys.io/",
618618
"auditUrls": ["auditUrl1", "auditUrl2"],
619-
"version": "1.0.0",
620-
"lastUpdated": "April 20, 2023"
619+
"version": "1.1.6",
620+
"lastUpdated": "September 26, 2024"
621621
}
622622
},
623623
"notifications": {

test/e2e/constants.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export const BUNDLER_URL = 'http://localhost:3000/rpc';
2020

2121
/* URL of the 4337 account snap site. */
2222
export const ERC_4337_ACCOUNT_SNAP_URL =
23-
'https://metamask.github.io/snap-account-abstraction-keyring/0.4.1/';
23+
'https://metamask.github.io/snap-account-abstraction-keyring/0.4.2/';
2424

2525
/* Salt used to generate the 4337 account. */
2626
export const ERC_4337_ACCOUNT_SALT = '0x1';
@@ -31,7 +31,7 @@ export const SIMPLE_ACCOUNT_FACTORY =
3131

3232
/* URL of the Snap Simple Keyring site. */
3333
export const TEST_SNAPS_SIMPLE_KEYRING_WEBSITE_URL =
34-
'https://metamask.github.io/snap-simple-keyring/1.1.2/';
34+
'https://metamask.github.io/snap-simple-keyring/1.1.6/';
3535

3636
/* Address of the VerifyingPaymaster smart contract deployed to Ganache. */
3737
export const VERIFYING_PAYMASTER = '0xbdbDEc38ed168331b1F7004cc9e5392A2272C1D7';

test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-background-state.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@
211211
"smartTransactionsOptInStatus": false,
212212
"showNativeTokenAsMainBalance": true,
213213
"petnamesEnabled": true,
214+
"showMultiRpcModal": "boolean",
214215
"isRedesignedConfirmationsDeveloperEnabled": "boolean",
215216
"redesignedConfirmationsEnabled": true,
216217
"redesignedTransactionsEnabled": "boolean",
@@ -304,7 +305,8 @@
304305
"TxController": {
305306
"methodData": "object",
306307
"transactions": "object",
307-
"lastFetchedBlockNumbers": "object"
308+
"lastFetchedBlockNumbers": "object",
309+
"submitHistory": "object"
308310
},
309311
"UserOperationController": { "userOperations": "object" },
310312
"UserStorageController": {

test/e2e/tests/metrics/state-snapshots/errors-after-init-opt-in-ui-state.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
"smartTransactionsOptInStatus": false,
3434
"showNativeTokenAsMainBalance": true,
3535
"petnamesEnabled": true,
36+
"showMultiRpcModal": "boolean",
3637
"isRedesignedConfirmationsDeveloperEnabled": "boolean",
3738
"redesignedConfirmationsEnabled": true,
3839
"redesignedTransactionsEnabled": "boolean",
@@ -179,6 +180,7 @@
179180
"logs": "object",
180181
"methodData": "object",
181182
"lastFetchedBlockNumbers": "object",
183+
"submitHistory": "object",
182184
"fiatCurrency": "usd",
183185
"rates": { "btc": { "conversionDate": 0, "conversionRate": "0" } },
184186
"cryptocurrencies": ["btc"],

ui/pages/snap-account-redirect/__snapshots__/create-snap-redirect.test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ exports[`<SnapAccountRedirect /> renders the url and message when provided and i
107107
class="mm-box mm-text mm-text--body-md mm-box--padding-2 mm-box--color-primary-default"
108108
data-testid="snap-account-redirect-url-display-box"
109109
>
110-
https://metamask.github.io/snap-simple-keyring/1.1.2/
110+
https://metamask.github.io/snap-simple-keyring/1.1.6/
111111
</p>
112112
<button
113113
aria-label=""

0 commit comments

Comments
 (0)