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

feat: 7.37.1 #12662

Merged
merged 6 commits into from
Dec 20, 2024
Merged

feat: 7.37.1 #12662

merged 6 commits into from
Dec 20, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Dec 12, 2024

This is the hot fix release candidate for version 7.37.1.

Team sign-off checklist

  • team-confirmations

@sethkfman sethkfman changed the base branch from main to stable December 12, 2024 17:24
runway-github bot and others added 3 commits December 12, 2024 16:51
…lled / unknown smart transactions (#12670)

- fix: mark transactions as failed for cancelled / unknown smart
transactions (#12664)

## **Description**
Resolves an issue with stuck transactions for some users who used smart
transactions, which was caused by having [this
PR](#12274) in the
7.36.0 release even when it was marked for 7.37.0 by metamaskbot.

## **Related issues**

Fixes:

## **Manual testing steps**

1. Cancelled transaction stuck thanks to super low gas settings
2. All other submitted transactions afterwards as well with the
invalid_nonce error.
3. Upgrade to 7.37.1 and see all cancelled tx
4. Try a new tx

## **Screenshots/Recordings**

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

### **Before**

https://consensys.slack.com/archives/C084S32G337/p1734034013370979

### **After**

https://consensys.slack.com/archives/C084S32G337/p1734039388196979

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding

Standards](https://github.com/MetaMask/metamask-mobile/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-mobile/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.
[cfb77b9](cfb77b9)

Co-authored-by: Daniel <80175477+dan437@users.noreply.github.com>
…tion script + add a new migration case (#12698)

- fix: small refactoring of the latest migration script + add a new
migration case (#12694)

## **Description**
Little follow up on this one:
#12664

Main thing is to also mark a regular transaction as `failed` if the STX
status was `resolved`. It's very rare (like the `unknown` state), but we
want to handle such case as well.

## **Related issues**

Fixes:

## **Manual testing steps**

1. Cancelled transaction stuck thanks to super low gas settings
2. All other submitted transactions afterwards as well with the
invalid_nonce error.
3. Upgrade to 7.37.1 and see all cancelled tx
4. Try a new tx

## **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 Mobile
Coding

Standards](https://github.com/MetaMask/metamask-mobile/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-mobile/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.
[82c500f](82c500f)

Co-authored-by: Daniel <80175477+dan437@users.noreply.github.com>
<!--
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**

Cherry pick bf126d0

## **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 Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/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-mobile/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.

Co-authored-by: cryptodev-2s <109512101+cryptodev-2s@users.noreply.github.com>
Copy link
Contributor Author

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.

Copy link

@sethkfman sethkfman added team-mobile-platform Run Smoke E2E Triggers smoke e2e on Bitrise labels Dec 16, 2024
Copy link
Contributor Author

github-actions bot commented Dec 16, 2024

https://bitrise.io/ Bitrise

✅✅✅ pr_smoke_e2e_pipeline passed on Bitrise! ✅✅✅

Commit hash: 0c4b1f6
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/96423bee-ff2a-4719-9369-0ca4c7969c79

Note

  • You can kick off another pr_smoke_e2e_pipeline on Bitrise by removing and re-applying the Run Smoke E2E label on the pull request

@sethkfman sethkfman marked this pull request as ready for review December 19, 2024 19:33
@sethkfman sethkfman requested review from a team as code owners December 19, 2024 19:33
@sethkfman sethkfman changed the base branch from stable to main December 20, 2024 17:20
@sethkfman sethkfman changed the base branch from main to stable December 20, 2024 18:18
@sethkfman
Copy link
Contributor

sethkfman commented Dec 20, 2024

yarn build:attribution

Copy link
Contributor

@sethkfman sethkfman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@sethkfman sethkfman merged commit 0f74530 into stable Dec 20, 2024
25 of 45 checks passed
@sethkfman sethkfman deleted the release/7.37.1 branch December 20, 2024 20:18
@github-actions github-actions bot locked and limited conversation to collaborators Dec 20, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Run Smoke E2E Triggers smoke e2e on Bitrise team-mobile-platform
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants