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

Fix NetworkController to handle clearing of messenger #5116

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

mcmire
Copy link
Contributor

@mcmire mcmire commented Jan 8, 2025

Explanation

If the network controller is in the process of executing the lookupNetwork step and the messenger is cleared of subscriptions, then it may throw an error that the networkDidChange subscription is missing. This happens in Mobile when it destroys the engine. There are actually two places where lookupNetwork subscribes to networkDidChange and then unsubscribes, but the aforementioned error is only replicable with one of them. However, we handle both cases just in case.

References

Fixes #5115.

Changelog

(Updated in PR.)

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
  • I've prepared draft pull requests for clients and consumer packages to resolve any breaking changes

If the network controller is in the process of executing the
`lookupNetwork` step and the messenger is cleared of subscriptions, then
it may throw an error that the `networkDidChange` subscription is
missing. This happens in Mobile when it destroys the engine. There are
actually two places where `lookupNetwork` subscribes to
`networkDidChange` and then unsubscribes, but the aforementioned error
is only replicable with one of them. However, we handle both cases just
in case.
@mcmire mcmire force-pushed the handle-missing-subscription-in-nc branch from 8590275 to ffa69e9 Compare January 8, 2025 22:36
@mcmire mcmire self-assigned this Jan 8, 2025
@mcmire mcmire marked this pull request as ready for review January 8, 2025 22:42
@mcmire mcmire requested review from a team as code owners January 8, 2025 22:42
Copy link

@mirceanis mirceanis left a comment

Choose a reason for hiding this comment

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

Looks ok to me

@mathieuartu
Copy link
Contributor

@metamaskbot publish-preview

Copy link
Contributor

github-actions bot commented Jan 9, 2025

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": "20.0.2-preview-ffa69e9",
  "@metamask-previews/address-book-controller": "6.0.2-preview-ffa69e9",
  "@metamask-previews/announcement-controller": "7.0.2-preview-ffa69e9",
  "@metamask-previews/approval-controller": "7.1.1-preview-ffa69e9",
  "@metamask-previews/assets-controllers": "45.1.2-preview-ffa69e9",
  "@metamask-previews/base-controller": "7.1.0-preview-ffa69e9",
  "@metamask-previews/build-utils": "3.0.2-preview-ffa69e9",
  "@metamask-previews/chain-controller": "0.2.2-preview-ffa69e9",
  "@metamask-previews/composable-controller": "10.0.0-preview-ffa69e9",
  "@metamask-previews/controller-utils": "11.4.4-preview-ffa69e9",
  "@metamask-previews/ens-controller": "15.0.1-preview-ffa69e9",
  "@metamask-previews/eth-json-rpc-provider": "4.1.7-preview-ffa69e9",
  "@metamask-previews/gas-fee-controller": "22.0.2-preview-ffa69e9",
  "@metamask-previews/json-rpc-engine": "10.0.2-preview-ffa69e9",
  "@metamask-previews/json-rpc-middleware-stream": "8.0.6-preview-ffa69e9",
  "@metamask-previews/keyring-controller": "19.0.2-preview-ffa69e9",
  "@metamask-previews/logging-controller": "6.0.3-preview-ffa69e9",
  "@metamask-previews/message-manager": "11.0.3-preview-ffa69e9",
  "@metamask-previews/multichain": "2.0.0-preview-ffa69e9",
  "@metamask-previews/name-controller": "8.0.2-preview-ffa69e9",
  "@metamask-previews/network-controller": "22.1.1-preview-ffa69e9",
  "@metamask-previews/notification-services-controller": "0.15.0-preview-ffa69e9",
  "@metamask-previews/permission-controller": "11.0.4-preview-ffa69e9",
  "@metamask-previews/permission-log-controller": "3.0.2-preview-ffa69e9",
  "@metamask-previews/phishing-controller": "12.3.1-preview-ffa69e9",
  "@metamask-previews/polling-controller": "12.0.2-preview-ffa69e9",
  "@metamask-previews/preferences-controller": "15.0.1-preview-ffa69e9",
  "@metamask-previews/profile-sync-controller": "3.1.1-preview-ffa69e9",
  "@metamask-previews/queued-request-controller": "8.0.2-preview-ffa69e9",
  "@metamask-previews/rate-limit-controller": "6.0.2-preview-ffa69e9",
  "@metamask-previews/remote-feature-flag-controller": "1.2.0-preview-ffa69e9",
  "@metamask-previews/selected-network-controller": "20.0.2-preview-ffa69e9",
  "@metamask-previews/signature-controller": "23.2.0-preview-ffa69e9",
  "@metamask-previews/transaction-controller": "42.1.0-preview-ffa69e9",
  "@metamask-previews/user-operation-controller": "21.0.0-preview-ffa69e9"
}

Copy link
Contributor

@mathieuartu mathieuartu left a comment

Choose a reason for hiding this comment

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

This fixes my PR, thanks a ton! LGTM 🏆

mathieuartu added a commit that referenced this pull request Jan 9, 2025
## Explanation

This PR moves the logic related to account syncing from
`UserStorageController` to separated files in the `account-syncing`
folder.
It also improves test coverage related to account syncing to 100%.


## References

Related to #4923

- Extension draft PR:
MetaMask/metamask-extension#29316
  - CI & E2E Passes ✅ 
- I needed to add the new `isAccountSyncingInProgress` state key at
various places to make it pass CI (as expected)
  - Account syncing is enabled on extension
- Mobile draft PR:
MetaMask/metamask-mobile#12755
  - CI passes BUT ✅ ☝️  
- I needed to add the new isAccountSyncingInProgress state key at
various places to make it pass CI (as expected)
- UTs were broken. It seems to be linked to the latest version of
`NetworkController` and its `NetworkController:networkDidChange` event.
This latest version is requested by our controller as part of the
upcoming network syncing feature.
- This will require a separate PR that bumps `NetworkController` to
`v22.1.1` (or another incriminated dependency TBD)
- This has started to be addressed here:
MetaMask/metamask-mobile#12765
- This was fixed by this PR: #5116
  - In any case, account syncing is **NOT** enabled on mobile yet

## Changelog

<!--
If you're making any consumer-facing changes, list those changes here as
if you were updating a changelog, using the template below as a guide.

(CATEGORY is one of BREAKING, ADDED, CHANGED, DEPRECATED, REMOVED, or
FIXED. For security-related issues, follow the Security Advisory
process.)

Please take care to name the exact pieces of the API you've added or
changed (e.g. types, interfaces, functions, or methods).

If there are any breaking changes, make sure to offer a solution for
consumers to follow once they upgrade to the changes.

Finally, if you're only making changes to development scripts or tests,
you may replace the template below with "None".
-->

### `@metamask/profile-sync-controller`

- **CHANGED**: moved account syncing logic to its own files
- **BREAKING**: added a new `isAccountSyncingInProgress` state key

## Checklist

- [x] I've updated the test suite for new or updated code as appropriate
- [x] I've updated documentation (JSDoc, Markdown, etc.) for new or
updated code as appropriate
- [x] I've highlighted breaking changes using the "BREAKING" category
above as appropriate
- [x] I've prepared draft pull requests for clients and consumer
packages to resolve any breaking changes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

NetworkController.lookupNetwork throws if messenger is cleared midway through
3 participants