Skip to content

fix: resolve tx custodian promise when set transaction to submitted or failed#3845

Merged
vinistevam merged 6 commits intomainfrom
fix/mmi-resolve-promise
Jan 26, 2024
Merged

fix: resolve tx custodian promise when set transaction to submitted or failed#3845
vinistevam merged 6 commits intomainfrom
fix/mmi-resolve-promise

Conversation

@vinistevam
Copy link
Copy Markdown
Contributor

@vinistevam vinistevam commented Jan 25, 2024

Explanation

This PR aims to fix an issue with the custodian transaction where the promise is not resolved.

References

Changelog

@metamask/transaction-controller

  • FIXED: Emit txId:finished when custodian transaction status is updated to submitted or failed

Checklist

  • I've updated the test suite for new or updated code as appropriate
  • I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate
  • I've highlighted breaking changes using the "BREAKING" category above as appropriate

@github-actions
Copy link
Copy Markdown
Contributor

Preview builds have been published. See these instructions for more information about preview builds.

Expand for full list of packages and versions.
{
  "@metamask-previews/accounts-controller": "10.0.0-preview.2431602",
  "@metamask-previews/address-book-controller": "3.1.7-preview.2431602",
  "@metamask-previews/announcement-controller": "5.0.2-preview.2431602",
  "@metamask-previews/approval-controller": "5.1.2-preview.2431602",
  "@metamask-previews/assets-controllers": "25.0.0-preview.2431602",
  "@metamask-previews/base-controller": "4.1.1-preview.2431602",
  "@metamask-previews/build-utils": "1.0.2-preview.2431602",
  "@metamask-previews/composable-controller": "5.0.1-preview.2431602",
  "@metamask-previews/controller-utils": "8.0.2-preview.2431602",
  "@metamask-previews/ens-controller": "9.0.0-preview.2431602",
  "@metamask-previews/eth-json-rpc-provider": "2.3.2-preview.2431602",
  "@metamask-previews/gas-fee-controller": "13.0.0-preview.2431602",
  "@metamask-previews/json-rpc-engine": "7.3.2-preview.2431602",
  "@metamask-previews/json-rpc-middleware-stream": "6.0.2-preview.2431602",
  "@metamask-previews/keyring-controller": "12.2.0-preview.2431602",
  "@metamask-previews/logging-controller": "2.0.2-preview.2431602",
  "@metamask-previews/message-manager": "7.3.8-preview.2431602",
  "@metamask-previews/name-controller": "5.0.0-preview.2431602",
  "@metamask-previews/network-controller": "17.2.0-preview.2431602",
  "@metamask-previews/notification-controller": "4.0.2-preview.2431602",
  "@metamask-previews/permission-controller": "8.0.0-preview.2431602",
  "@metamask-previews/permission-log-controller": "0.0.0-preview.2431602",
  "@metamask-previews/phishing-controller": "8.0.2-preview.2431602",
  "@metamask-previews/polling-controller": "5.0.0-preview.2431602",
  "@metamask-previews/preferences-controller": "7.0.0-preview.2431602",
  "@metamask-previews/queued-request-controller": "0.4.0-preview.2431602",
  "@metamask-previews/rate-limit-controller": "4.0.2-preview.2431602",
  "@metamask-previews/selected-network-controller": "7.0.0-preview.2431602",
  "@metamask-previews/signature-controller": "12.0.0-preview.2431602",
  "@metamask-previews/transaction-controller": "21.0.0-preview.2431602",
  "@metamask-previews/user-operation-controller": "2.0.0-preview.2431602"
}

@vinistevam vinistevam force-pushed the fix/mmi-resolve-promise branch from 2431602 to 8cdddaf Compare January 25, 2024 10:44
@vinistevam
Copy link
Copy Markdown
Contributor Author

@metamaskbot publish-preview

@github-actions
Copy link
Copy Markdown
Contributor

Preview builds have been published. See these instructions for more information about preview builds.

Expand for full list of packages and versions.
{
  "@metamask-previews/accounts-controller": "10.0.0-preview.8cdddaf",
  "@metamask-previews/address-book-controller": "3.1.7-preview.8cdddaf",
  "@metamask-previews/announcement-controller": "5.0.2-preview.8cdddaf",
  "@metamask-previews/approval-controller": "5.1.2-preview.8cdddaf",
  "@metamask-previews/assets-controllers": "25.0.0-preview.8cdddaf",
  "@metamask-previews/base-controller": "4.1.1-preview.8cdddaf",
  "@metamask-previews/build-utils": "1.0.2-preview.8cdddaf",
  "@metamask-previews/composable-controller": "5.0.1-preview.8cdddaf",
  "@metamask-previews/controller-utils": "8.0.2-preview.8cdddaf",
  "@metamask-previews/ens-controller": "9.0.0-preview.8cdddaf",
  "@metamask-previews/eth-json-rpc-provider": "2.3.2-preview.8cdddaf",
  "@metamask-previews/gas-fee-controller": "13.0.0-preview.8cdddaf",
  "@metamask-previews/json-rpc-engine": "7.3.2-preview.8cdddaf",
  "@metamask-previews/json-rpc-middleware-stream": "6.0.2-preview.8cdddaf",
  "@metamask-previews/keyring-controller": "12.2.0-preview.8cdddaf",
  "@metamask-previews/logging-controller": "2.0.2-preview.8cdddaf",
  "@metamask-previews/message-manager": "7.3.8-preview.8cdddaf",
  "@metamask-previews/name-controller": "5.0.0-preview.8cdddaf",
  "@metamask-previews/network-controller": "17.2.0-preview.8cdddaf",
  "@metamask-previews/notification-controller": "4.0.2-preview.8cdddaf",
  "@metamask-previews/permission-controller": "8.0.0-preview.8cdddaf",
  "@metamask-previews/permission-log-controller": "0.0.0-preview.8cdddaf",
  "@metamask-previews/phishing-controller": "8.0.2-preview.8cdddaf",
  "@metamask-previews/polling-controller": "5.0.0-preview.8cdddaf",
  "@metamask-previews/preferences-controller": "7.0.0-preview.8cdddaf",
  "@metamask-previews/queued-request-controller": "0.4.0-preview.8cdddaf",
  "@metamask-previews/rate-limit-controller": "4.0.2-preview.8cdddaf",
  "@metamask-previews/selected-network-controller": "7.0.0-preview.8cdddaf",
  "@metamask-previews/signature-controller": "12.0.0-preview.8cdddaf",
  "@metamask-previews/transaction-controller": "21.0.0-preview.8cdddaf",
  "@metamask-previews/user-operation-controller": "2.0.0-preview.8cdddaf"
}

@vinistevam vinistevam changed the title fix: mmi resolve promise when set transaction to submitted fix: resolve tx custodian promise when set transaction to submitted or failed Jan 25, 2024
@vinistevam vinistevam marked this pull request as ready for review January 25, 2024 11:23
@vinistevam vinistevam requested a review from a team as a code owner January 25, 2024 11:23
bergarces
bergarces previously approved these changes Jan 25, 2024
@vinistevam vinistevam merged commit 94d97ad into main Jan 26, 2024
@vinistevam vinistevam deleted the fix/mmi-resolve-promise branch January 26, 2024 13:58
vinistevam added a commit to MetaMask/metamask-extension that referenced this pull request Jan 30, 2024
## **Description**
The package `@metamask/transaction-controller` has been upgraded to
`v21.0.1`.

This version has the following fixes:
- Resolves transaction custodian promise when setting transaction status
to submitted or failed
([#3845](MetaMask/core#3845))
- Fix normalizer ensuring property type is always present in
TransactionParams ([#3817](MetaMask/core#3817))

See here for the changelog:
https://github.com/MetaMask/core/blob/main/packages/transaction-controller/CHANGELOG.md#2101
shane-t pushed a commit to MetaMask/metamask-extension that referenced this pull request Jan 30, 2024
The package `@metamask/transaction-controller` has been upgraded to
`v21.0.1`.

This version has the following fixes:
- Resolves transaction custodian promise when setting transaction status
to submitted or failed
([#3845](MetaMask/core#3845))
- Fix normalizer ensuring property type is always present in
TransactionParams ([#3817](MetaMask/core#3817))

See here for the changelog:
https://github.com/MetaMask/core/blob/main/packages/transaction-controller/CHANGELOG.md#2101
shane-t pushed a commit to MetaMask/metamask-extension that referenced this pull request Jan 30, 2024
The package `@metamask/transaction-controller` has been upgraded to
`v21.0.1`.

This version has the following fixes:
- Resolves transaction custodian promise when setting transaction status
to submitted or failed
([#3845](MetaMask/core#3845))
- Fix normalizer ensuring property type is always present in
TransactionParams ([#3817](MetaMask/core#3817))

See here for the changelog:
https://github.com/MetaMask/core/blob/main/packages/transaction-controller/CHANGELOG.md#2101
zone-live pushed a commit to MetaMask/metamask-extension that referenced this pull request Feb 7, 2024
…n (no cherry-pick) (#22730)

## **Description**

Patches `@metamask/transaction-controller` to fix a critical issue with
MMI

Since `v11.9.0` is two major versions of
`@metamask/transaction-controller`, it is safer to include this fix as a
patch instead of including other multiple breaking changes.

PR that addresses the change in the package:
MetaMask/core#3845
PR that merges that change in develop:
#22674

## **Related issues**

Fixes:


https://consensyssoftware.atlassian.net/jira/software/projects/MMI/boards/315?assignee=5e664f7f9abcc30ce60c3734&selectedIssue=MMI-4508

## **Pre-merge author checklist**

- [X] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [X] I've clearly explained what problem this PR is solving and how it
is solved.
- [X] I've linked related issues
- [ ] I've included manual testing steps
- [X] I've included screenshots/recordings if applicable
- [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.
- [X] I’ve properly set the pull request status:
  - [ ] In case it's not yet "ready for review", I've set it to "draft".
- [ ] In case it's "ready for review", I've changed it from "draft" to
"non-draft".

## **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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants