Merged
Conversation
Mrtenz
reviewed
Oct 10, 2025
Mrtenz
reviewed
Oct 10, 2025
Mrtenz
reviewed
Oct 10, 2025
Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>
Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>
Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com>
Member
|
thank you for your detailed review @Mrtenz 🙏 changes added! |
Mrtenz
approved these changes
Oct 10, 2025
7 tasks
github-merge-queue bot
pushed a commit
to MetaMask/metamask-extension
that referenced
this pull request
Oct 13, 2025
…nd remove live requests to the site (#36801) <!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> ## **Description** This PR implements a localserver for the `snap-account-abstraction-keyring-site` instead of going to the live site, in our e2e, to avoid flakiness. This implies the following: - Removing all related live requests from the allowlist - Adding the `snap-account-abstraction-keyring-site` as an npm package - Updating the snap simple keyring binaries, as the version was updated to 1.0.0 . The changes are just the result of running this yarn update-snap-binary --snap-account-abstraction-keyring@1.0.0 - In our tests, we are not going to localhost directly, as localhost is not in the allowlist for that snap. So we take the same approach as we did before, suggested by @FrederikBolding , where we proxy the localhost, so we still see the origin as metamask.github so then we don't get errors, and we avoid adding localhost in the allowlist (this was a small security concern). Context: https://consensys.slack.com/archives/GN3SR3GNM/p1759489395046839 Usage in our e2e: ```javascript await withFixtures( { dapp: true, dappPaths: ['snap-account-abstraction-keyring-site'], ... ``` - Related work: [test: add snap-simple-keyring-site as a local server and remove live requests to the site](#36557) - Snap Account Abstraction Keyring Release PR: MetaMask/snap-account-abstraction-keyring#216 [](https://codespaces.new/MetaMask/metamask-extension/pull/36801?quickstart=1) ## **Changelog** <!-- If this PR is not End-User-Facing and should not show up in the CHANGELOG, you can choose to either: 1. Write `CHANGELOG entry: null` 2. Label with `no-changelog` If this PR is End-User-Facing, please write a short User-Facing description in the past tense like: `CHANGELOG entry: Added a new tab for users to see their NFTs` `CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker` (This helps the Release Engineer do their job more quickly and accurately) --> CHANGELOG entry: ## **Related issues** Fixes: https://consensyssoftware.atlassian.net/browse/MMQA-428 ## **Manual testing steps** 1. Check ci ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** - [ ] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've completed the PR template to the best of my ability - [ ] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.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. <!-- CURSOR_SUMMARY --> --- > [!NOTE] > E2E tests now use a locally served `@metamask/snap-account-abstraction-keyring-site` with new mocks, removing live site requests and updating related configs and dependencies (including ethers 5.8). > > - **E2E/Testing**: > - Serve `@metamask/snap-account-abstraction-keyring-site` locally via `dappPaths` and new mock proxy (`account-abstraction-keyring-site-mocks.ts`). > - Replace snap mocks import; install flow updated to wait for dialog close; integrate site and swaps mocks together. > - Remove live site URLs from `test/e2e/mock-e2e-allowlist.js`. > - **Config/Tooling**: > - Add `@metamask/snap-account-abstraction-keyring-site` to `package.json` and `.depcheckrc.yml` ignore list. > - Update snap binary headers for `snap-account-abstraction-keyring@1.0.0`. > - Extend test helper to resolve local site path. > - **Security Policy**: > - Adjust LavaMoat Browserify/Webpack policies to reference `ethers` subpackages consistently (switch to `ethers>@ethersproject/*`). > - **Dependencies**: > - Bump `ethers` and all `@ethersproject/*` to `5.8.0`; update `ws`, `elliptic` accordingly. > - Refresh MetaMask packages (`json-rpc-engine`, `json-rpc-middleware-stream`, add legacy `providers` for site) and add site-related packages. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit bc72af3. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> --------- Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
](https://codespaces.new/MetaMask/metamask-extension/pull/36801?quickstart=1){kind=link}
github-merge-queue bot
pushed a commit
to MetaMask/metamask-extension
that referenced
this pull request
Oct 13, 2025
…nd remove live requests to the site (#36801) <!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> ## **Description** This PR implements a localserver for the `snap-account-abstraction-keyring-site` instead of going to the live site, in our e2e, to avoid flakiness. This implies the following: - Removing all related live requests from the allowlist - Adding the `snap-account-abstraction-keyring-site` as an npm package - Updating the snap simple keyring binaries, as the version was updated to 1.0.0 . The changes are just the result of running this yarn update-snap-binary --snap-account-abstraction-keyring@1.0.0 - In our tests, we are not going to localhost directly, as localhost is not in the allowlist for that snap. So we take the same approach as we did before, suggested by @FrederikBolding , where we proxy the localhost, so we still see the origin as metamask.github so then we don't get errors, and we avoid adding localhost in the allowlist (this was a small security concern). Context: https://consensys.slack.com/archives/GN3SR3GNM/p1759489395046839 Usage in our e2e: ```javascript await withFixtures( { dapp: true, dappPaths: ['snap-account-abstraction-keyring-site'], ... ``` - Related work: [test: add snap-simple-keyring-site as a local server and remove live requests to the site](#36557) - Snap Account Abstraction Keyring Release PR: MetaMask/snap-account-abstraction-keyring#216 [](https://codespaces.new/MetaMask/metamask-extension/pull/36801?quickstart=1) ## **Changelog** <!-- If this PR is not End-User-Facing and should not show up in the CHANGELOG, you can choose to either: 1. Write `CHANGELOG entry: null` 2. Label with `no-changelog` If this PR is End-User-Facing, please write a short User-Facing description in the past tense like: `CHANGELOG entry: Added a new tab for users to see their NFTs` `CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker` (This helps the Release Engineer do their job more quickly and accurately) --> CHANGELOG entry: ## **Related issues** Fixes: https://consensyssoftware.atlassian.net/browse/MMQA-428 ## **Manual testing steps** 1. Check ci ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** - [ ] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've completed the PR template to the best of my ability - [ ] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.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. <!-- CURSOR_SUMMARY --> --- > [!NOTE] > E2E tests now use a locally served `@metamask/snap-account-abstraction-keyring-site` with new mocks, removing live site requests and updating related configs and dependencies (including ethers 5.8). > > - **E2E/Testing**: > - Serve `@metamask/snap-account-abstraction-keyring-site` locally via `dappPaths` and new mock proxy (`account-abstraction-keyring-site-mocks.ts`). > - Replace snap mocks import; install flow updated to wait for dialog close; integrate site and swaps mocks together. > - Remove live site URLs from `test/e2e/mock-e2e-allowlist.js`. > - **Config/Tooling**: > - Add `@metamask/snap-account-abstraction-keyring-site` to `package.json` and `.depcheckrc.yml` ignore list. > - Update snap binary headers for `snap-account-abstraction-keyring@1.0.0`. > - Extend test helper to resolve local site path. > - **Security Policy**: > - Adjust LavaMoat Browserify/Webpack policies to reference `ethers` subpackages consistently (switch to `ethers>@ethersproject/*`). > - **Dependencies**: > - Bump `ethers` and all `@ethersproject/*` to `5.8.0`; update `ws`, `elliptic` accordingly. > - Refresh MetaMask packages (`json-rpc-engine`, `json-rpc-middleware-stream`, add legacy `providers` for site) and add site-related packages. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit bc72af3. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> --------- Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
github-merge-queue bot
pushed a commit
to MetaMask/metamask-extension
that referenced
this pull request
Oct 13, 2025
…nd remove live requests to the site (#36801) <!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> ## **Description** This PR implements a localserver for the `snap-account-abstraction-keyring-site` instead of going to the live site, in our e2e, to avoid flakiness. This implies the following: - Removing all related live requests from the allowlist - Adding the `snap-account-abstraction-keyring-site` as an npm package - Updating the snap simple keyring binaries, as the version was updated to 1.0.0 . The changes are just the result of running this yarn update-snap-binary --snap-account-abstraction-keyring@1.0.0 - In our tests, we are not going to localhost directly, as localhost is not in the allowlist for that snap. So we take the same approach as we did before, suggested by @FrederikBolding , where we proxy the localhost, so we still see the origin as metamask.github so then we don't get errors, and we avoid adding localhost in the allowlist (this was a small security concern). Context: https://consensys.slack.com/archives/GN3SR3GNM/p1759489395046839 Usage in our e2e: ```javascript await withFixtures( { dapp: true, dappPaths: ['snap-account-abstraction-keyring-site'], ... ``` - Related work: [test: add snap-simple-keyring-site as a local server and remove live requests to the site](#36557) - Snap Account Abstraction Keyring Release PR: MetaMask/snap-account-abstraction-keyring#216 [](https://codespaces.new/MetaMask/metamask-extension/pull/36801?quickstart=1) ## **Changelog** <!-- If this PR is not End-User-Facing and should not show up in the CHANGELOG, you can choose to either: 1. Write `CHANGELOG entry: null` 2. Label with `no-changelog` If this PR is End-User-Facing, please write a short User-Facing description in the past tense like: `CHANGELOG entry: Added a new tab for users to see their NFTs` `CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker` (This helps the Release Engineer do their job more quickly and accurately) --> CHANGELOG entry: ## **Related issues** Fixes: https://consensyssoftware.atlassian.net/browse/MMQA-428 ## **Manual testing steps** 1. Check ci ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** - [ ] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [ ] I've completed the PR template to the best of my ability - [ ] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.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. <!-- CURSOR_SUMMARY --> --- > [!NOTE] > E2E tests now use a locally served `@metamask/snap-account-abstraction-keyring-site` with new mocks, removing live site requests and updating related configs and dependencies (including ethers 5.8). > > - **E2E/Testing**: > - Serve `@metamask/snap-account-abstraction-keyring-site` locally via `dappPaths` and new mock proxy (`account-abstraction-keyring-site-mocks.ts`). > - Replace snap mocks import; install flow updated to wait for dialog close; integrate site and swaps mocks together. > - Remove live site URLs from `test/e2e/mock-e2e-allowlist.js`. > - **Config/Tooling**: > - Add `@metamask/snap-account-abstraction-keyring-site` to `package.json` and `.depcheckrc.yml` ignore list. > - Update snap binary headers for `snap-account-abstraction-keyring@1.0.0`. > - Extend test helper to resolve local site path. > - **Security Policy**: > - Adjust LavaMoat Browserify/Webpack policies to reference `ethers` subpackages consistently (switch to `ethers>@ethersproject/*`). > - **Dependencies**: > - Bump `ethers` and all `@ethersproject/*` to `5.8.0`; update `ws`, `elliptic` accordingly. > - Refresh MetaMask packages (`json-rpc-engine`, `json-rpc-middleware-stream`, add legacy `providers` for site) and add site-related packages. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit bc72af3. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> --------- Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is the release candidate for version 1.0.0.
Note
Prepare 1.0.0 release by bumping versions, updating changelogs, and refreshing the snap manifest shasum.
1.0.0in rootpackage.json,packages/site/package.json,packages/snap/package.json, andpackages/snap/snap.manifest.json.packages/site/CHANGELOG.md: add1.0.0with making the site publishable and switching to CentraNo1 font; update compare links.packages/snap/CHANGELOG.md: add1.0.0notingethersbump and returningnullwhenhandleKeyringRequestyieldsundefined; update compare links.source.shasuminpackages/snap/snap.manifest.json.Written by Cursor Bugbot for commit e3cb3a6. This will update automatically on new commits. Configure here.