Skip to content

Commit

Permalink
chore: update accounts related packages (#27284)
Browse files Browse the repository at this point in the history
## **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.
  • Loading branch information
ccharly authored Oct 7, 2024
1 parent ec698f8 commit e354ad5
Show file tree
Hide file tree
Showing 7 changed files with 68 additions and 109 deletions.
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -297,14 +297,14 @@
"@metamask-institutional/transaction-update": "^0.2.5",
"@metamask-institutional/types": "^1.1.0",
"@metamask/abi-utils": "^2.0.2",
"@metamask/account-watcher": "^4.1.0",
"@metamask/accounts-controller": "^18.2.1",
"@metamask/account-watcher": "^4.1.1",
"@metamask/accounts-controller": "^18.2.2",
"@metamask/address-book-controller": "^6.0.0",
"@metamask/announcement-controller": "^7.0.0",
"@metamask/approval-controller": "^7.0.0",
"@metamask/assets-controllers": "^37.0.0",
"@metamask/base-controller": "^7.0.0",
"@metamask/bitcoin-wallet-snap": "^0.6.0",
"@metamask/bitcoin-wallet-snap": "^0.6.1",
"@metamask/browser-passworder": "^4.3.0",
"@metamask/contract-metadata": "^2.5.0",
"@metamask/controller-utils": "^11.2.0",
Expand All @@ -316,17 +316,17 @@
"@metamask/eth-ledger-bridge-keyring": "^3.0.1",
"@metamask/eth-query": "^4.0.0",
"@metamask/eth-sig-util": "^7.0.1",
"@metamask/eth-snap-keyring": "^4.3.3",
"@metamask/eth-snap-keyring": "^4.3.6",
"@metamask/eth-token-tracker": "^8.0.0",
"@metamask/eth-trezor-keyring": "^3.1.0",
"@metamask/eth-trezor-keyring": "^3.1.3",
"@metamask/etherscan-link": "^3.0.0",
"@metamask/ethjs": "^0.6.0",
"@metamask/ethjs-contract": "^0.4.1",
"@metamask/ethjs-query": "^0.7.1",
"@metamask/gas-fee-controller": "^18.0.0",
"@metamask/jazzicon": "^2.0.0",
"@metamask/keyring-api": "^8.1.0",
"@metamask/keyring-controller": "^17.2.1",
"@metamask/keyring-api": "^8.1.3",
"@metamask/keyring-controller": "^17.2.2",
"@metamask/logging-controller": "^6.0.0",
"@metamask/logo": "^3.1.2",
"@metamask/message-manager": "^10.1.0",
Expand Down Expand Up @@ -359,7 +359,7 @@
"@metamask/snaps-rpc-methods": "^11.1.1",
"@metamask/snaps-sdk": "^6.5.1",
"@metamask/snaps-utils": "^8.1.1",
"@metamask/transaction-controller": "^37.0.0",
"@metamask/transaction-controller": "^37.1.0",
"@metamask/user-operation-controller": "^13.0.0",
"@metamask/utils": "^9.1.0",
"@ngraveio/bc-ur": "^1.1.12",
Expand Down
4 changes: 2 additions & 2 deletions test/data/mock-state.json
Original file line number Diff line number Diff line change
Expand Up @@ -616,8 +616,8 @@
"developer": "Metamask",
"website": "https://www.consensys.io/",
"auditUrls": ["auditUrl1", "auditUrl2"],
"version": "1.0.0",
"lastUpdated": "April 20, 2023"
"version": "1.1.6",
"lastUpdated": "September 26, 2024"
}
},
"notifications": {
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const BUNDLER_URL = 'http://localhost:3000/rpc';

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

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

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

/* Address of the VerifyingPaymaster smart contract deployed to Ganache. */
export const VERIFYING_PAYMASTER = '0xbdbDEc38ed168331b1F7004cc9e5392A2272C1D7';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@
"smartTransactionsOptInStatus": false,
"showNativeTokenAsMainBalance": true,
"petnamesEnabled": true,
"showMultiRpcModal": "boolean",
"isRedesignedConfirmationsDeveloperEnabled": "boolean",
"redesignedConfirmationsEnabled": true,
"redesignedTransactionsEnabled": "boolean",
Expand Down Expand Up @@ -304,7 +305,8 @@
"TxController": {
"methodData": "object",
"transactions": "object",
"lastFetchedBlockNumbers": "object"
"lastFetchedBlockNumbers": "object",
"submitHistory": "object"
},
"UserOperationController": { "userOperations": "object" },
"UserStorageController": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"smartTransactionsOptInStatus": false,
"showNativeTokenAsMainBalance": true,
"petnamesEnabled": true,
"showMultiRpcModal": "boolean",
"isRedesignedConfirmationsDeveloperEnabled": "boolean",
"redesignedConfirmationsEnabled": true,
"redesignedTransactionsEnabled": "boolean",
Expand Down Expand Up @@ -179,6 +180,7 @@
"logs": "object",
"methodData": "object",
"lastFetchedBlockNumbers": "object",
"submitHistory": "object",
"fiatCurrency": "usd",
"rates": { "btc": { "conversionDate": 0, "conversionRate": "0" } },
"cryptocurrencies": ["btc"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ exports[`<SnapAccountRedirect /> renders the url and message when provided and i
class="mm-box mm-text mm-text--body-md mm-box--padding-2 mm-box--color-primary-default"
data-testid="snap-account-redirect-url-display-box"
>
https://metamask.github.io/snap-simple-keyring/1.1.2/
https://metamask.github.io/snap-simple-keyring/1.1.6/
</p>
<button
aria-label=""
Expand Down
Loading

0 comments on commit e354ad5

Please sign in to comment.