Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cherry-pick – chore: bump transaction-controller to 29.0.2 (#24701) into v11.16.0 #24740

Merged
merged 1 commit into from
May 23, 2024

Conversation

dbrans
Copy link
Contributor

@dbrans dbrans commented May 23, 2024

cherry-pick – chore: bump transaction-controller to 29.0.2 637c0f3 (#24701) into v11.16.0

Notes:

  • Dan ran
    1. git cherry-pick 637c0f3
    2. git checkout HEAD -- yarn.lock (so that now there is no diff with yarn.lock)
    3. manually fixed the conflict in package.json
    4. yarn && yarn dedupe
  • Merge conflicts in package.json:
    "@metamask/signature-controller": "^12.0.0",
    "@metamask/smart-transactions-controller": "^10.0.1",
<<<<<<< HEAD
    "@metamask/snaps-controllers": "8.0.0",
    "@metamask/snaps-execution-environments": "6.0.2",
    "@metamask/snaps-rpc-methods": "8.0.0",
    "@metamask/snaps-sdk": "4.0.1",
    "@metamask/snaps-utils": "7.2.0",
    "@metamask/transaction-controller": "^28.1.1",
    "@metamask/user-operation-controller": "^6.0.0",
=======
    "@metamask/snaps-controllers": "^8.1.1",
    "@metamask/snaps-execution-environments": "^6.1.0",
    "@metamask/snaps-rpc-methods": "^9.0.0",
    "@metamask/snaps-sdk": "^4.2.0",
    "@metamask/snaps-utils": "^7.4.0",
    "@metamask/transaction-controller": "^29.0.2",
    "@metamask/user-operation-controller": "^8.0.1",
>>>>>>> 637c0f3a08 (chore: bump transaction-controller to 29.0.2 (#24701))
    "@metamask/utils": "^8.2.1",
    "@ngraveio/bc-ur": "^1.1.12",

Copy link
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.

@metamaskbot metamaskbot added the INVALID-PR-TEMPLATE PR's body doesn't match template label May 23, 2024
Copy link

socket-security bot commented May 23, 2024

New and removed dependencies detected. Learn more about Socket for GitHub ↗︎

Package New capabilities Transitives Size Publisher
npm/@metamask/[email protected] Transitive: environment +4 564 kB

View full report↗︎

Copy link

socket-security bot commented May 23, 2024

👍 Dependency issues cleared. Learn more about Socket for GitHub ↗︎

This PR previously contained dependency changes with security issues that have been resolved, removed, or ignored.

View full report↗︎

@dbrans dbrans added the team-transactions Transactions team label May 23, 2024
@dbrans dbrans marked this pull request as ready for review May 23, 2024 11:38
@dbrans dbrans requested a review from a team as a code owner May 23, 2024 11:38
@dbrans
Copy link
Contributor Author

dbrans commented May 23, 2024

@metamaskbot update-policies

@metamaskbot
Copy link
Collaborator

Policy update failed. You can review the logs or retry the policy update here

Bump transaction controller to get a couple fixes in.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/24701?quickstart=1)

Fixes: #24586
Fixes: #24183
Related: #24359
@keithchew to verify

1. Go to this page...
2.
3.

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

<!-- [screenshots/recordings] -->

<!-- [screenshots/recordings] -->

- [ ] I’ve followed [MetaMask 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.

- [ ] 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.
@danjm danjm force-pushed the Version-v11.16.0-txctlr-bump branch from fb4023f to 6dbe537 Compare May 23, 2024 12:28
@dbrans dbrans force-pushed the Version-v11.16.0-txctlr-bump branch from 6dbe537 to 6ece696 Compare May 23, 2024 12:29
@danjm danjm force-pushed the Version-v11.16.0-txctlr-bump branch from 6ece696 to 6dbe537 Compare May 23, 2024 12:30
Copy link

codecov bot commented May 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.42%. Comparing base (43832ef) to head (6dbe537).

Additional details and impacted files
@@                Coverage Diff                @@
##           Version-v11.16.0   #24740   +/-   ##
=================================================
  Coverage             67.42%   67.42%           
=================================================
  Files                  1265     1265           
  Lines                 49385    49385           
  Branches              12846    12846           
=================================================
  Hits                  33296    33296           
  Misses                16089    16089           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@metamaskbot
Copy link
Collaborator

Builds ready [6dbe537]
Page Load Metrics (1141 ± 576 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint682331184622
domContentLoaded11532694
load55339711411199576
domInteractive11532694

@danjm danjm merged commit a848063 into Version-v11.16.0 May 23, 2024
76 of 77 checks passed
@danjm danjm deleted the Version-v11.16.0-txctlr-bump branch May 23, 2024 15:00
@github-actions github-actions bot locked and limited conversation to collaborators May 23, 2024
@metamaskbot metamaskbot added the release-11.16.0 Issue or pull request that will be included in release 11.16.0 label May 23, 2024
@metamaskbot
Copy link
Collaborator

No release label on PR. Adding release label release-11.16.0 on PR, as PR was cherry-picked in branch 11.16.0.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
INVALID-PR-TEMPLATE PR's body doesn't match template release-11.16.0 Issue or pull request that will be included in release 11.16.0 team-transactions Transactions team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants