chore: Update v12.5.0 with master#27797
Merged
danjm merged 12 commits intoVersion-v12.5.0from Oct 16, 2024
Merged
Conversation
## **Description** The advisory GHSA-593m-55hh-j8gv has been temporarily ignored, just for v12.4.x. This is resolved by a dependency update in v12.5.0, but the update included too many functional changes, so we deemed it too risky to backport in this release. The impact is expected to be negligable due to our use of LavaMoat and SES lockdown. [](https://codespaces.new/MetaMask/metamask-extension/pull/27676?quickstart=1) ## **Related issues** The audit advisory was resolved here on `develop`: #27620 And it was back ported to v12.5.0 here: #27673 ## **Manual testing steps** N/A ## **Screenshots/Recordings** N/A ## **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.
…ks between transactions (#27634) ## **Description** Nonce in state should be reset correctly when switching between different networks. The issue is already fixed in develop by PR: #27297 ## **Related issues** Fixes: #27657 ## **Manual testing steps** 1. Connect to Arbitrum 2. Submit transaction with the high nonce 3. Observe it fails with Internal JSON RPC error 4. Switch to BNB Chain 5. Start a transaction 6. Transaction is created with correct nonce ## **Screenshots/Recordings** NA ## **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 - [ ] 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.
<!-- 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** Fix changelog for v12.4.0 [](https://codespaces.new/MetaMask/metamask-extension/pull/27558?quickstart=1) ## **Related issues** Fixes: ## **Manual testing steps** 1. Go to this page... 2. 3. ## **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/develop/.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/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. --------- Co-authored-by: Dan J Miller <danjm.com@gmail.com>
Version v12.4.0 RC
…4.1 RC (#27757) ## **Description** Cherry picks swaps undefined object access crash hotfix intov12.4.1RC. See [here](#27708) for more info [](https://codespaces.new/MetaMask/metamask-extension/pull/27757?quickstart=1) ## **Related issues** https://consensyssoftware.atlassian.net/jira/software/projects/MMS/boards/447/backlog?assignee=5ae37c7e42b8a62c4e15d92a&selectedIssue=MMS-1569 ## **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** - [x] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [x] 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. --------- Co-authored-by: Mark Stacey <markjstacey@gmail.com>
Version v12.4.1 RC
Contributor
|
CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes. |
danjm
reviewed
Oct 15, 2024
CHANGELOG.md
Outdated
| @@ -9,108 +9,37 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 | |||
| ## [12.5.0] | |||
|
|
|||
| ## [12.4.0] | |||
Contributor
There was a problem hiding this comment.
This first ## [12.4.0] should not be here
Contributor
Author
There was a problem hiding this comment.
Thanks @danjm, now its addressed after your comment.
danjm
reviewed
Oct 15, 2024
CHANGELOG.md
Outdated
|
|
||
| [Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.5.0...HEAD | ||
| [12.5.0]: https://github.com/MetaMask/metamask-extension/compare/v12.4.0...v12.5.0 | ||
| [Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.4.1...HEAD |
Contributor
There was a problem hiding this comment.
Also, there is a changelog error here
Contributor
Author
There was a problem hiding this comment.
I have noted the instruction you have provided in the meeting, especially regarding resolving the changelog by running the command yarn lint:changelog and manually checking the file.
Collaborator
Builds ready [6568a21]
Page Load Metrics (1812 ± 186 ms)
|
Collaborator
|
No release label on PR. Adding release label release-12.5.0 on PR, as PR was added to branch 12.5.0 when release was cut. |
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
8 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.
Description
Merged latest master to v12.5.0